D2597: graft: add test for reading old graftstate files with new mechanism

martinvonz added inline comments. INLINE COMMENTS > test-graft.t:1417 > + created new head > + $ hg oldgraft -r 1 -r 2 --config extensions.oldgraft=$TESTTMP/oldgraft.py > + merging b Can this line be replaced by `hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate` and remove the need for the

D3654: graft: start using the cmdstate class to read and write data to graftstate

martinvonz added inline comments. INLINE COMMENTS > commands.py:2389-2390 > +try: > +statedata = graftstate.read() > +return statedata > +except error.CorruptedState: Will join these two lines in flight. (I don't know if you're going to make this more complex in the

D3653: state: removing remaining instances of opts class variable

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6f67bfe4b82f: state: removing remaining instances of opts class variable (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3653?vs=8884=8887#toc REPOSITORY

D3653: state: removing remaining instances of opts class variable

martinvonz accepted this revision. martinvonz added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > state.py:46 > fname is the file name in which data should be stored in .hg > directory > opts is a dictionary of data of the statefile >

[PATCH] filemerge: don't pass function name as loadpath's module_name param

# HG changeset patch # User hindlemail # Date 1527199007 21600 # Thu May 24 15:56:47 2018 -0600 # Node ID c5db59b1bae015d926ef172d9201141a40719781 # Parent bd7a3fa71a7291b8b77e6bf03be1d2273391 filemerge: don't pass function name as loadpath's module_name param diff

Re: how to import tags?

> On May 24, 2018, at 4:35 PM, Hollis Blanchard > wrote: > > On 05/24/2018 11:38 AM, Augie Fackler wrote: >> >> >>> On May 24, 2018, at 2:20 PM, Hollis Blanchard >>> wrote: >>> >>> On 05/23/2018 03:15 PM, Hollis Blanchard wrote:

[PATCH] hook: add more robust python: syntax checking

# HG changeset patch # User hindlemail # Date 1527195876 21600 # Thu May 24 15:04:36 2018 -0600 # Node ID a30dbd52f2148af7f2d9167b5935367e899b7244 # Parent bd7a3fa71a7291b8b77e6bf03be1d2273391 hook: add more robust python: syntax checking Added checking for missing

D3187: phase: add dry-run functionality

pulkit added a comment. In https://phab.mercurial-scm.org/D3187#57349, @khanchi97 wrote: > okay, but I have some queries like > > 1. How about showing revision no. instead of cset id? I think we should show cset ids. If you want to with rev numbers, go with that. This should

D2938: grep: make grep search on working directory by default

sangeet259 added a comment. @yuja So I was working on it, but the way I tried to correct "wdir()" is by handling it as a special case, so introducing an "if" block again similar to this. But you were asking to eliminate the if/else block altogether, I wonder if there is way ?

D3654: graft: start using the cmdstate class to read and write data to graftstate

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch replaces the logic to read and write data to graftstate file to use the state.cmdstate() class. The previous graftstate format didn't had any

D2597: graft: add test for reading old graftstate files with new mechanism

pulkit updated this revision to Diff 8886. pulkit edited the summary of this revision. pulkit retitled this revision from "graft: add test for reading old format state files with new mechanism" to "graft: add test for reading old graftstate files with new mechanism". REPOSITORY rHG Mercurial

D3652: graft: use state.cmdstate() to check whether graftstate exists

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a step towards make graft use the new state.cmdstate() class. This patch replaces the ugly try-except with nice if-else conditionals. REPOSITORY rHG

D3653: state: removing remaining instances of opts class variable

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The cmdstate class used to have a class variable opts which used to be a dict which stored all the data for the state. Recent cleanups removed the use of that

D3651: graft: factor out function to read graft state in separate function

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Fatcoring out the logic in a separate function will help us in adding conditional logic for different versions of graft state files. REPOSITORY rHG Mercurial

D3633: py3: use bytes in tests/printenv.py

pulkit added a comment. Looks like this needs to be dropped because due to this couple of tests which were already passing failed. Link to buildbot: https://buildbot.mercurial-scm.org/builders/py3%20tests/builds/920/steps/run-tests.py%20%28python3%29/logs/stdio REPOSITORY rHG Mercurial

Re: how to import tags?

On 05/24/2018 11:38 AM, Augie Fackler wrote: On May 24, 2018, at 2:20 PM, Hollis Blanchard > wrote: On 05/23/2018 03:15 PM, Hollis Blanchard wrote: 2. Commit tags as children of the correct head. I don't see a 'tag' cmdline

Re: how to import tags?

> On May 24, 2018, at 2:20 PM, Hollis Blanchard > wrote: > > On 05/23/2018 03:15 PM, Hollis Blanchard wrote: >> >> 2. Commit tags as children of the correct head. >> >> I don't see a 'tag' cmdline option for this, though: the parent commit is >> the parent of

Re: how to import tags?

On 05/23/2018 03:15 PM, Hollis Blanchard wrote: 2. Commit tags as children of the correct head. I don't see a 'tag' cmdline option for this, though: the parent commit is the parent of the working directory, without an ability to override. That means I would need to keep working directories

[PATCH 3 of 3] phases: define an official tuple of phases we do not share

# HG changeset patch # User Boris Feld # Date 1527005437 -7200 # Tue May 22 18:10:37 2018 +0200 # Node ID 77c8b6ecb15d43bc1874d50f1fc9a21a8cb73edb # Parent 46cf734ba8851c97ae6850356486df66767c368f # EXP-Topic phases-cleanup # Available At

[PATCH 2 of 3] phases: define an official tuple of mutable phases

# HG changeset patch # User Boris Feld # Date 1527005400 -7200 # Tue May 22 18:10:00 2018 +0200 # Node ID 46cf734ba8851c97ae6850356486df66767c368f # Parent 4e5fd4b6300a9a58a0acdc718c39468b2cbe4989 # EXP-Topic phases-cleanup # Available At

[PATCH 1 of 3] repoview: use 'phasecache.getrevset' when computing 'unserved' filter

# HG changeset patch # User Boris Feld # Date 1526916830 -7200 # Mon May 21 17:33:50 2018 +0200 # Node ID 4e5fd4b6300a9a58a0acdc718c39468b2cbe4989 # Parent 53cc81a8caf6106ca0cb7ae1d67586236c3bf4fc # EXP-Topic phases-cleanup # Available At

D3620: tests: fix test-patch.t on picker /bin/sh implementations

durin42 added a comment. In https://phab.mercurial-scm.org/D3620#57370, @martinvonz wrote: > In https://phab.mercurial-scm.org/D3620#57369, @durin42 wrote: > > > In https://phab.mercurial-scm.org/D3620#57367, @martinvonz wrote: > > > > > > FreeBSD sh(1) doesn't accept -d, so we

D3620: tests: fix test-patch.t on picker /bin/sh implementations

martinvonz added a comment. In https://phab.mercurial-scm.org/D3620#57369, @durin42 wrote: > In https://phab.mercurial-scm.org/D3620#57367, @martinvonz wrote: > > > > FreeBSD sh(1) doesn't accept -d, so we weren't testing what we > > > expected there. Let's just use a simple Python

D3620: tests: fix test-patch.t on picker /bin/sh implementations

durin42 added a comment. In https://phab.mercurial-scm.org/D3620#57367, @martinvonz wrote: > > FreeBSD sh(1) doesn't accept -d, so we weren't testing what we > > expected there. Let's just use a simple Python script instead. > > This confused me for longer than it should. I assume

D3620: tests: fix test-patch.t on picker /bin/sh implementations

martinvonz added a comment. > FreeBSD sh(1) doesn't accept -d, so we weren't testing what we > expected there. Let's just use a simple Python script instead. This confused me for longer than it should. I assume you just mean -c instead of -d. REPOSITORY rHG Mercurial REVISION

Re: [PATCH STABLE] help: mention pattern syntax of latesttag() template function

On Thu, May 24, 2018 at 8:13 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1527171988 -32400 > # Thu May 24 23:26:28 2018 +0900 > # Branch stable > # Node ID 6f102e6b25c09d78a86886423db3ca0c612a59fb > # Parent

[PATCH STABLE] help: mention pattern syntax of latesttag() template function

# HG changeset patch # User Yuya Nishihara # Date 1527171988 -32400 # Thu May 24 23:26:28 2018 +0900 # Branch stable # Node ID 6f102e6b25c09d78a86886423db3ca0c612a59fb # Parent a3b4ccbec269a4ffabdcc681212a36bbbdc4cca8 help: mention pattern syntax of latesttag() template

mercurial@38037: 4 new changesets (4 on stable)

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/cf6605c2d135 changeset: 38034:cf6605c2d135 branch: stable parent: 37815:32a75a8a5b0f user:FUJIWARA Katsunori date:Tue May 01 18:22:52 2018 +0900 summary:

[PATCH 1 of 2 RESEND] extensions: peek command table of disabled extensions without importing

# HG changeset patch # User Yuya Nishihara # Date 1525340282 -32400 # Thu May 03 18:38:02 2018 +0900 # Node ID a9b271c7d3c095c381da92be0ad7bfd2e9555ac9 # Parent c3960c7e66fad7436f1a550ef1de693a635faa3a extensions: peek command table of disabled extensions without importing

[PATCH 2 of 2 RESEND] extensions: remove strip_init=True from _disabledpaths()

# HG changeset patch # User Yuya Nishihara # Date 1525340398 -32400 # Thu May 03 18:39:58 2018 +0900 # Node ID 5a2a14d118b52b14078ceb52d8b9732570ccf581 # Parent a9b271c7d3c095c381da92be0ad7bfd2e9555ac9 extensions: remove strip_init=True from _disabledpaths() It's no longer

[PATCH] transaction-summary: show phase changes statistics in pull/unbundle

# HG changeset patch # User Denis Laxalde # Date 1527157190 -7200 # Thu May 24 12:19:50 2018 +0200 # Node ID 48bc12fc4aee84bffa539f9ced452e6c686a53e4 # Parent 37ef6ee87488ac0095f8dedf75284f64d1d54455 # Available At http://hg.logilab.org/users/dlaxalde/hg #

[PATCH STABLE] help: correct signature of separate() template function

# HG changeset patch # User Yuya Nishihara # Date 1527166471 -32400 # Thu May 24 21:54:31 2018 +0900 # Branch stable # Node ID a3b4ccbec269a4ffabdcc681212a36bbbdc4cca8 # Parent 5b831053d9b68fbb9afcc89d75391aee31f6cbb0 help: correct signature of separate() template function

Re: [PATCH 3 of 4] diff: accept "dict" as diff option

On Thu, 24 May 2018 10:38:56 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1526993961 -7200 > # Tue May 22 14:59:21 2018 +0200 > # Node ID d76075d78a860ea2b3e01f3c05969cd0b8839f35 > # Parent 2f2232e5f0b60a3dd591ea16dfffc3c0a050acdc > #

Re: [PATCH 2 of 4] context: also take all other arguments than `patch.diff` accept

On Thu, 24 May 2018 10:38:55 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1527082300 -7200 > # Wed May 23 15:31:40 2018 +0200 > # Node ID 2f2232e5f0b60a3dd591ea16dfffc3c0a050acdc > # Parent 4e013ebfa2c64f1849cb3a4242c47da981b35198 > #

Re: [PATCH 1 of 4] context: explicitly take diffopts in `context.diff` (API)

On Thu, 24 May 2018 10:38:54 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1526994172 -7200 > # Tue May 22 15:02:52 2018 +0200 > # Node ID 4e013ebfa2c64f1849cb3a4242c47da981b35198 > # Parent 37ef6ee87488ac0095f8dedf75284f64d1d54455 > #

D3650: serve: add an option to open in the default browser

nspanti-logilab created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It is inspired by a similar functionality in pydoc. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D3650

[Bug 5894] New: Text-based markers in inline diffs

https://bz.mercurial-scm.org/show_bug.cgi?id=5894 Bug ID: 5894 Summary: Text-based markers in inline diffs Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity:

D3649: serve: add option print-url

nspanti-logilab created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It can be used to open hgweb in a web browser. Example : xdg-open "`hg serve --print-url`". REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D3639: remotenames: add paths argument to remotenames revset

yuja added a comment. > +def _parsepaths(x): > +"""parses the argument passed in revsets as paths and return > +them as a set or returns None if no path is specified""" > + > +if not x: > +return None > + > +paths = set() > +if x[0] in

Re: D3639: remotenames: add paths argument to remotenames revset

> +def _parsepaths(x): > +"""parses the argument passed in revsets as paths and return > +them as a set or returns None if no path is specified""" > + > +if not x: > +return None > + > +paths = set() > +if x[0] in ('symbol', 'string'): > +paths.add(x[1]) > +

[Bug 5893] New: --pager and help about pager (2 bugs)

https://bz.mercurial-scm.org/show_bug.cgi?id=5893 Bug ID: 5893 Summary: --pager and help about pager (2 bugs) Product: Mercurial Version: 4.5.3 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug

D3187: phase: add dry-run functionality

khanchi97 added a comment. okay, but I have some queries like 1. How about showing revision no. instead of cset id? 2. And in this https://pastebin.com/raw/kWcr9xVK example if I change revision 2 phase to --secret then how it should print the range, I mean now we have branches in this

Re: [PATCH 1 of 2] githelp: drop the trailing period from single sentence output for consistency

On Thu, May 24, 2018 at 7:59 AM Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1527128224 14400 > # Wed May 23 22:17:04 2018 -0400 > # Node ID cfa93fbbe9b4ee98d66a7dc55cb0224c4cf03e9f > # Parent

[PATCH 2 of 4] context: also take all other arguments than `patch.diff` accept

# HG changeset patch # User Boris Feld # Date 1527082300 -7200 # Wed May 23 15:31:40 2018 +0200 # Node ID 2f2232e5f0b60a3dd591ea16dfffc3c0a050acdc # Parent 4e013ebfa2c64f1849cb3a4242c47da981b35198 # EXP-Topic diff-cleanup # Available At

[PATCH 1 of 4] context: explicitly take diffopts in `context.diff` (API)

# HG changeset patch # User Boris Feld # Date 1526994172 -7200 # Tue May 22 15:02:52 2018 +0200 # Node ID 4e013ebfa2c64f1849cb3a4242c47da981b35198 # Parent 37ef6ee87488ac0095f8dedf75284f64d1d54455 # EXP-Topic diff-cleanup # Available At

[PATCH 4 of 4] diff: use `context.diff` to produce diff

# HG changeset patch # User Boris Feld # Date 1527082304 -7200 # Wed May 23 15:31:44 2018 +0200 # Node ID 7f96a8be51519fb345cb6a659ae7615f695ec766 # Parent d76075d78a860ea2b3e01f3c05969cd0b8839f35 # EXP-Topic diff-cleanup # Available At

[PATCH 3 of 4] diff: accept "dict" as diff option

# HG changeset patch # User Boris Feld # Date 1526993961 -7200 # Tue May 22 14:59:21 2018 +0200 # Node ID d76075d78a860ea2b3e01f3c05969cd0b8839f35 # Parent 2f2232e5f0b60a3dd591ea16dfffc3c0a050acdc # EXP-Topic diff-cleanup # Available At