D7677: typing: suppress a warning that mercurial.windows.checkosfilename is missing

Closed by commit rHG09bcbeacedc7: typing: suppress a warning that mercurial.windows.checkosfilename is missing (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7666: update: add some tests for the status quo of morestatus on update conflicts

Closed by commit rHG5709a9992c2a: update: add some tests for the status quo of morestatus on update conflicts (authored by rdamazio). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7676: typing: add an assertion to util.versiontuple

Closed by commit rHGa21a6dad4b38: typing: add an assertion to util.versiontuple (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7676?vs=18740=18751

D7674: typing: add a couple of assertions to lrucachedict to help pytype

Closed by commit rHGb5655f337bd7: typing: add a couple of assertions to lrucachedict to help pytype (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7620: merge: add commands.merge.require-rev to require an argument to hg merge

Closed by commit rHG8caec25f5d8f: merge: add commands.merge.require-rev to require an argument to hg merge (authored by spectral). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7673: util: rename a variable to avoid confusing pytype

Closed by commit rHGeff050dbb703: util: rename a variable to avoid confusing pytype (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7673?vs=18737=18749

D7672: pytype: suppress the import-error in util.py when importing re2

Closed by commit rHG40bd667491a7: pytype: suppress the import-error in util.py when importing re2 (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7632: graft: reuse cmdutl.resolvecommitoptions()

Closed by commit rHG8376d5d62d36: graft: reuse cmdutl.resolvecommitoptions() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7632?vs=18667=18744 CHANGES

D7671: debugcommands: finish moving `extendeddateformats` from util to dateutil

Closed by commit rHG38d6aa768310: debugcommands: finish moving `extendeddateformats` from util to dateutil (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7670: ui: convert exception data to bytes when printing chained exception info

Closed by commit rHGe63b27fb0595: ui: convert exception data to bytes when printing chained exception info (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7669: ui: use a context manager to handle file streams in edit()

Closed by commit rHGe5f69e3bb3f6: ui: use a context manager to handle file streams in edit() (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7664: rebase: make rebase not crash if p1 == p2 != nullid

Closed by commit rHGc6feee1e4d5b: rebase: make rebase not crash if p1 == p2 != nullid (authored by spectral). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7664?vs=18720=18743

D7633: clone: extract helper for checking mutually exclusive args

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in cmdutil.py:263 > I don't think I'd be able to guess what a function by that name did either. > `check_at_most_one_argument` seems clearer, but maybe too long. I'll wait a > bit for other ideas before I change anything. I

D7632: graft: reuse cmdutl.resolvecommitoptions()

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. After this, if both `--currentuser` and `--user` are passed, `--currentuser` takes precedence, which is not the behavior right now. But the new behavior is better and consistent with other

D7677: typing: suppress a warning that mercurial.windows.checkosfilename is missing

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This function is used to check filename portability everwhere, so it isn't tucked into the windows.py module. I supposed the alternative is to move it and

D7676: typing: add an assertion to util.versiontuple

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes the following warning: line 1177, in versiontuple: No attribute 'split' on None [attribute-error] In Optional[bytes] REPOSITORY rHG

D7675: util: move common proxyobserver attributes to the base class

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes the following pytype warnings: line 791, in _writedata: No attribute 'logdata' on baseproxyobserver [attribute-error] line 792, in _writedata:

D7674: typing: add a couple of assertions to lrucachedict to help pytype

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes the following warnings: line 1488, in pop: No attribute 'markempty' on None [attribute-error] In Optional[Union[Any, _lrucachenode,

D7671: debugcommands: finish moving `extendeddateformats` from util to dateutil

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Caught by pytype. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7671 AFFECTED FILES mercurial/debugcommands.py CHANGE

D7673: util: rename a variable to avoid confusing pytype

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fixes the following warning: line 1205, in f: No attribute 'append' on Dict[nothing, nothing] [attribute-error] In Union[Dict[nothing,

D7672: pytype: suppress the import-error in util.py when importing re2

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7672 AFFECTED FILES mercurial/util.py CHANGE DETAILS diff --git a/mercurial/util.py

D7670: ui: convert exception data to bytes when printing chained exception info

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Caught by pytype. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7670 AFFECTED FILES mercurial/ui.py CHANGE DETAILS diff

D7669: ui: use a context manager to handle file streams in edit()

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7669 AFFECTED FILES mercurial/ui.py CHANGE DETAILS diff --git a/mercurial/ui.py