Re: [PATCH 2 of 5] merge: show list of bids for each file in bid-merge in ui.note()

On Fri, 11 Sep 2020 12:35:30 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1598442653 -19800 > # Wed Aug 26 17:20:53 2020 +0530 > # Node ID 76753724e6b5453d9540c73b1a1a6f11de818e46 > # Parent c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf >

Re: [PATCH 5 of 5] merge: move initial handling of mergeactions near to later one

On Fri, 11 Sep 2020 12:35:33 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1599119729 -19800 > # Thu Sep 03 13:25:29 2020 +0530 > # Node ID c48ee69a8c7202517cade973b3abe3715bfc3c5e > # Parent 8abe98dc3e3c020566d64ac3f3b802de2751d55f >

Re: [PATCH 1 of 5] debugmergestate: show extras for files which are not in mergestate

On Fri, 11 Sep 2020 12:35:29 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1598275759 -19800 > # Mon Aug 24 18:59:19 2020 +0530 > # Node ID c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf > # Parent c889e1fddc190ff73265939965706b2dd0bfec3b >

Re: [PATCH 2 of 2] tags: take lock while writing `tags2` cache

On Fri, 11 Sep 2020 12:34:01 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1599727895 -19800 > # Thu Sep 10 14:21:35 2020 +0530 > # Node ID 3eae3d3a1b44b0fe10e00766e1113c50d48ed086 > # Parent 3095d36efcaf9ce835249c9312e892b0d54aac78 >

Re: [PATCH 1 of 2] tests: update lockdelay.py to handle the `wait` argument

On Fri, 11 Sep 2020 12:34:00 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1599736900 -19800 > # Thu Sep 10 16:51:40 2020 +0530 > # Node ID 3095d36efcaf9ce835249c9312e892b0d54aac78 > # Parent 64de86fd0984ff1e2306de52849be7ebf7dcfd25 >

Re: [PATCH V2] commit: pass mergestate into _filecommit() instead of re-reading it

On Fri, 11 Sep 2020 12:34:46 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1599122644 -19800 > # Thu Sep 03 14:14:04 2020 +0530 > # Node ID c889e1fddc190ff73265939965706b2dd0bfec3b > # Parent 64de86fd0984ff1e2306de52849be7ebf7dcfd25 >

D9017: tests: make emacs test less strict

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It was failing like this for me: @@ -2,7 +2,7 @@ $ emacs -q -no-site-file -batch -l $TESTDIR/../contrib/hg-test-mode.el \ > -f

D9016: histedit: cache description line

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Navigating the curses-based histedit interface can be pretty slow because it redraws everything whenever you make a change.

Re: [PATCH STABLE] log: fix crash and bad filematcher lookup by -fr'wdir()' PATH

This looks good to me. On 9/11/20 10:12 AM, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1599802865 -32400 # Fri Sep 11 14:41:05 2020 +0900 # Branch stable # Node ID d4a83a7d132ace8e3cfe366d9ef56fb99f26ffab # Parent 81b4e7c866ec83ac73e71ab791cb54ffcdfcd889 log:

D6259: [POC] revset: on-disk cache for children queries

marmoute added a comment. The approach used by the nodemap is probably a good way forward for transactional case. Some kind of happen only index, that get recompacked on a regular basis. Combined with an append only data file (for example, children can be stored as linked list (data file

[PATCH STABLE] log: fix crash and bad filematcher lookup by -fr'wdir()' PATH

# HG changeset patch # User Yuya Nishihara # Date 1599802865 -32400 # Fri Sep 11 14:41:05 2020 +0900 # Branch stable # Node ID d4a83a7d132ace8e3cfe366d9ef56fb99f26ffab # Parent 81b4e7c866ec83ac73e71ab791cb54ffcdfcd889 log: fix crash and bad filematcher lookup by -fr'wdir()' PATH

D9014: hg-core: add a `ListRevTrackedFiles` operation

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY List files tracked at a given revision. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9014 AFFECTED FILES

D9015: rhg: add `--revision` argument to `rhg files`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Add the option to list the tracked files of a revision given its number or full node id. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9013: hg-core: simplify `list_tracked_files` operation

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Use directly `ListDirstateTrackedFiles` rather than having an operation builder. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9012: hg-core: add `Revlog.get_node_rev`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Find the revision of a node given its full hash. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9012 AFFECTED

D9011: hg-core: add `Manifest` a specialized `Revlog`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY A facade to `Revlog` to provide a `manifest` specific interface. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9010: hg-core: add `Changlog` a specialized `Revlog`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY A facade to `Revlog` to provide a `changelog` specific interface. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9009: py3: fix bytes and str mixup in run-tests

khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9009 AFFECTED FILES tests/run-tests.py CHANGE DETAILS diff --git

D9008: templater: fix reading of templates in frozen binaries with py3 < 3.7

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY When using a frozen binary with py3 < 3.7, there's no `importlib.resources` module, so we use the code path that reads the resources from the file system.

[PATCH 5 of 5] merge: move initial handling of mergeactions near to later one

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599119729 -19800 # Thu Sep 03 13:25:29 2020 +0530 # Node ID c48ee69a8c7202517cade973b3abe3715bfc3c5e # Parent 8abe98dc3e3c020566d64ac3f3b802de2751d55f # EXP-Topic merge-newnode merge: move initial handling of

[PATCH 4 of 5] debugmergestate: sort extras before printing

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599124516 -19800 # Thu Sep 03 14:45:16 2020 +0530 # Node ID 8abe98dc3e3c020566d64ac3f3b802de2751d55f # Parent 4e5bb80a831d8201e3407cf78721b8d2d236b74d # EXP-Topic merge-newnode debugmergestate: sort extras before

[PATCH 3 of 5] merge: show number of ancestors in bid merge debug notes

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598442862 -19800 # Wed Aug 26 17:24:22 2020 +0530 # Node ID 4e5bb80a831d8201e3407cf78721b8d2d236b74d # Parent 76753724e6b5453d9540c73b1a1a6f11de818e46 # EXP-Topic merge-newnode merge: show number of ancestors in bid

[PATCH 1 of 5] debugmergestate: show extras for files which are not in mergestate

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598275759 -19800 # Mon Aug 24 18:59:19 2020 +0530 # Node ID c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf # Parent c889e1fddc190ff73265939965706b2dd0bfec3b # EXP-Topic merge-newnode debugmergestate: show extras for files

[PATCH 2 of 5] merge: show list of bids for each file in bid-merge in ui.note()

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598442653 -19800 # Wed Aug 26 17:20:53 2020 +0530 # Node ID 76753724e6b5453d9540c73b1a1a6f11de818e46 # Parent c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf # EXP-Topic merge-newnode merge: show list of bids for each file in

[PATCH V2] commit: pass mergestate into _filecommit() instead of re-reading it

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599122644 -19800 # Thu Sep 03 14:14:04 2020 +0530 # Node ID c889e1fddc190ff73265939965706b2dd0bfec3b # Parent 64de86fd0984ff1e2306de52849be7ebf7dcfd25 # EXP-Topic merge-newnode commit: pass mergestate into _filecommit()

[PATCH 2 of 2] tags: take lock while writing `tags2` cache

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599727895 -19800 # Thu Sep 10 14:21:35 2020 +0530 # Node ID 3eae3d3a1b44b0fe10e00766e1113c50d48ed086 # Parent 3095d36efcaf9ce835249c9312e892b0d54aac78 # EXP-Topic tags-fix tags: take lock while writing `tags2` cache

[PATCH 1 of 2] tests: update lockdelay.py to handle the `wait` argument

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599736900 -19800 # Thu Sep 10 16:51:40 2020 +0530 # Node ID 3095d36efcaf9ce835249c9312e892b0d54aac78 # Parent 64de86fd0984ff1e2306de52849be7ebf7dcfd25 # EXP-Topic tags-fix tests: update lockdelay.py to handle the `wait`