D243: obsmarker: rename precnode into prednode

2017-08-12 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > cmdutil.py:1916 > fm.write('index', '%i ', index) > -fm.write('precnode', '%s ', hex(marker.precnode())) > +fm.write('precnode', '%s ', hex(marker.prednode())) > succs = marker.succnodes() The template keyword should be updated

D242: context: rename troubled into isunstable

2017-08-12 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > context.py:246 > +self._repo.ui.deprecwarn(msg, '4.4') > +return self.isunstable() > + Please send a follow-up. This is too far from the tip to amend. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D242

D127: phabricator: add phabupdate command to update status in batch

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 842. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D127?vs=572=842 REVISION DETAIL https://phab.mercurial-scm.org/D127 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py

D126: phabricator: add status to revision query language

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 841. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D126?vs=571=841 REVISION DETAIL https://phab.mercurial-scm.org/D126 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py

D124: phabricator: change "readpatch" to be more flexible

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 839. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D124?vs=569=839 REVISION DETAIL https://phab.mercurial-scm.org/D124 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py

D122: phabricator: add --amend option to phabsend

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 838. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D122?vs=789=838 REVISION DETAIL https://phab.mercurial-scm.org/D122 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py

D125: phabricator: add a small language to query Differential Revisions

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 840. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D125?vs=743=840 REVISION DETAIL https://phab.mercurial-scm.org/D125 AFFECTED FILES contrib/phabricator.py CHANGE DETAILS diff --git a/contrib/phabricator.py

D366: phabricator: remove an unnecessary writediffproperties call

2017-08-12 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was introduced by https://phab.mercurial-scm.org/D229. Thanks Yuya for finding it! REPOSITORY rHG Mercurial REVISION DETAIL

D26: rebase: remove revignored and nullmerge states

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 834. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D26?vs=775=834 REVISION DETAIL https://phab.mercurial-scm.org/D26 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D24: rebase: remove revprecursor and revpruned states (BC)

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 833. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D24?vs=773=833 REVISION DETAIL https://phab.mercurial-scm.org/D24 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D348: rebase: change internal format to support destination map

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 836. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D348?vs=782=836 REVISION DETAIL https://phab.mercurial-scm.org/D348 AFFECTED FILES hgext/rebase.py tests/test-rebase-legacy.t CHANGE DETAILS diff --git

D23: rebase: move obsoleted not rebased messages earlier (BC)

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 832. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D23?vs=772=832 REVISION DETAIL https://phab.mercurial-scm.org/D23 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D347: rebase: rewrite _computeobsoletenotrebased

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 835. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D347?vs=781=835 REVISION DETAIL https://phab.mercurial-scm.org/D347 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D341: test-rebase-obsolete: add "\n" in template

2017-08-12 Thread quark (Jun Wu)
quark abandoned this revision. quark added a comment. https://phab.mercurial-scm.org/D340 was updated to not use `-p` (which is not that useful since it diffs against p1) so this change becomes less necessary. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D341

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 829. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D21?vs=765=829 REVISION DETAIL https://phab.mercurial-scm.org/D21 AFFECTED FILES hgext/rebase.py

D342: rebase: change "result would have 3 parent" error message (BC)

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 831. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D342?vs=769=831 REVISION DETAIL https://phab.mercurial-scm.org/D342 AFFECTED FILES hgext/rebase.py

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

2017-08-12 Thread quark (Jun Wu)
quark marked 8 inline comments as done. quark added inline comments. INLINE COMMENTS > quark wrote in rebase.py:1009 > Copy. Will change. Actually `oldps` is a tuple so `oldps[:]` does not work. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D21 To: quark,

D229: phabricator: update diff property even if we choose not to create a new diff

2017-08-12 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > phabricator.py:280 > diff = creatediff(ctx) > writediffproperties(ctx, diff) > transactions.append({'type': 'update', 'value': diff[r'phid']}) `writediffproperties()` is called twice. Perhaps one of them should be deleted.

D329: setup: Fix installing in a mingw environment

2017-08-12 Thread glandium (Mike Hommey)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7686cbb0ba41: setup: fix installing in a mingw environment (authored by glandium). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D329?vs=751=828 REVISION DETAIL

Re: [PATCH STABLE] i18n: use actual filename, in which function is defined, for hg.pot

2017-08-12 Thread Yuya Nishihara
On Sun, 13 Aug 2017 00:13:58 +0900, FUJIWARA Katsunori wrote: > At Sat, 05 Aug 2017 03:16:57 +0900, > FUJIWARA Katsunori wrote: > > > > At Fri, 4 Aug 2017 00:36:28 +0900, > > Yuya Nishihara wrote: > > > > > > On Wed, 02 Aug 2017 22:36:45 +0900, FUJIWARA Katsunori wrote: > > > > # HG changeset

Re: [PATCH STABLE] osx: delay version computation on macOS builds

2017-08-12 Thread Yuya Nishihara
On Thu, 10 Aug 2017 21:25:33 -0400, Kevin Bullock wrote: > # HG changeset patch > # User Kevin Bullock > # Date 1502414702 14400 > # Thu Aug 10 21:25:02 2017 -0400 > # Branch stable > # Node ID 0d3a872cbb37b7845eacdcaa578c0048e3f4873f > # Parent

mercurial@33667: 4 new changesets

2017-08-12 Thread Mercurial Commits
4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/f3407d56a6e8 changeset: 33664:f3407d56a6e8 parent: 33619:609606d21765 user:Pulkit Goyal <7895pul...@gmail.com> date:Wed Aug 02 03:08:42 2017 +0530 summary: bundle2: add the capability to store

D342: rebase: change "result would have 3 parent" error message (BC)

2017-08-12 Thread quark (Jun Wu)
quark added a comment. I guess the old error message was intended for the below case: $ hg debugdrawdag <<'EOF' > H > /| > D F > | |\ > C E G > \|/ > B Z > |/ > A > EOF $ hg rebase -d Z -r 'C+E+G+H' Removing D, having C

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

2017-08-12 Thread quark (Jun Wu)
quark added inline comments. INLINE COMMENTS > martinvonz wrote in rebase.py:1004 > It looks like it effectively is. You can rewrite it using isancestor(). The > reason I brought this up at all was that cl.ancestor() returns a single > ancestor even if there are multiple (as in criss-cross

[Bug 5656] New: suboptimal diff compared to previous versions

2017-08-12 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5656 Bug ID: 5656 Summary: suboptimal diff compared to previous versions Product: Mercurial Version: 4.3 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

2017-08-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > quark wrote in rebase.py:1004 > Line 1088 is not `isancestor`. I'm okay with having two functions here. Let > me know what do you prefer. It looks like it effectively is. You can rewrite it using isancestor(). The reason I brought this up at

D342: rebase: change "result would have 3 parent" error message (BC)

2017-08-12 Thread quark (Jun Wu)
quark planned changes to this revision. quark added inline comments. INLINE COMMENTS > martinvonz wrote in rebase.py:1066 > I feel like "Cannot rebase merge commit %d without rebasing at least one its > parents" would be more specific and still be accurate. > > It would be nice if we could

D355: contrib: add check flag for use of admonitions and its validity

2017-08-12 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Can you add tests for this. Also the commit message starts with "contrib", which seems unrelated here, please correct that. INLINE COMMENTS > releasenotes.py:543 > +if opts.get('check'): > +checkadmonitions(ui, repo, sections.names(), revs) > + You can

D342: rebase: change "result would have 3 parent" error message (BC)

2017-08-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > rebase.py:1066 > if set(newps) == set(oldps) and dest not in newps: > -# The error message is for compatibility. It's a bit misleading since > -# rebase is not supposed to add new parents. > -raise

D341: test-rebase-obsolete: add "\n" in template

2017-08-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz accepted this revision as: martinvonz. martinvonz added a comment. > This makes the test a bit cleaner since log --stat does not need to --stat should be -p REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D341 To: quark, #hg-reviewers, martinvonz

Re: [PATCH STABLE] i18n: use actual filename, in which function is defined, for hg.pot

2017-08-12 Thread FUJIWARA Katsunori
At Sat, 05 Aug 2017 03:16:57 +0900, FUJIWARA Katsunori wrote: > > At Fri, 4 Aug 2017 00:36:28 +0900, > Yuya Nishihara wrote: > > > > On Wed, 02 Aug 2017 22:36:45 +0900, FUJIWARA Katsunori wrote: > > > # HG changeset patch > > > # User FUJIWARA Katsunori > > > # Date

Re: [PATCH] templatekw: add singular names to refer list element in map expression

2017-08-12 Thread Yuya Nishihara
On Sat, 12 Aug 2017 23:07:25 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1502546625 -32400 > # Sat Aug 12 23:03:45 2017 +0900 > # Node ID 9a4194f1f4481c5b7983e31aeda9033c98d0a0fb > # Parent

[PATCH] templatekw: add singular names to refer list element in map expression

2017-08-12 Thread FUJIWARA Katsunori
# HG changeset patch # User FUJIWARA Katsunori # Date 1502546625 -32400 # Sat Aug 12 23:03:45 2017 +0900 # Node ID 9a4194f1f4481c5b7983e31aeda9033c98d0a0fb # Parent db6b666ce1e6c6fd26f6fb07c00fe0e3b18a081d # Available At https://bitbucket.org/foozy/mercurial-wip #

D362: hg: Avoid relying on errno numbers / descriptions

2017-08-12 Thread mithrandi (Tristan Seligmann)
mithrandi created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A few tests hardcode errno numbers and/or descriptions in the output, causing test failures on platforms where these values are different. REPOSITORY rHG

D361: hg: Tolerate long vs. int in test-context.py

2017-08-12 Thread mithrandi (Tristan Seligmann)
mithrandi created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The file times here can be longs instead of ints on some platforms, which will cause a test failure due to these printing with an L suffix; instead always

D299: pycompat: introduce a wrapper for __builtins__.{raw_,}input()

2017-08-12 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > hgk.py:100 > try: > -line = raw_input().split(' ') > +line = pycompat.bytesinput(sys.stdin, sys.stdout).split(' ') > node1 = line[0] Perhaps hgk should use ui.fin and ui.fout. > durin42

[Bug 5655] New: Crash on mips64el

2017-08-12 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5655 Bug ID: 5655 Summary: Crash on mips64el Product: Mercurial Version: 4.3 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish

D296: extensions: if on py3 and propname is a bytestr, convert to sysstr

2017-08-12 Thread yuja (Yuya Nishihara)
yuja added inline comments. INLINE COMMENTS > yuja wrote in extensions.py:388 > `pycompat.sysstr()` ? The "if" shouldn't be necessary. That's what `sysstr()` is for. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D296 To: durin42, #hg-reviewers Cc: yuja,

[PATCH 5 of 5 RFC] run_tests: know how to match Windows //?/C:\Something paths

2017-08-12 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1502478965 -10800 # Fri Aug 11 22:16:05 2017 +0300 # Node ID 83de181a018eb0e7ea138121a854a04569140cbe # Parent 85d8ab670c128337f27013168e3f57b037d7996e run_tests: know how to match Windows //?/C:\Something paths diff --git

[PATCH 3 of 5 RFC] dirstate: make dirstate._join a bit faster on posix

2017-08-12 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1502522493 25200 # Sat Aug 12 00:21:33 2017 -0700 # Node ID bac7b1ae4a0c998c57cea5eac51af66853779918 # Parent a1c8f310a66ada40697c824f4621bb54c757e9fa dirstate: make dirstate._join a bit faster on posix This is a

[PATCH 1 of 5 RFC] util: add platform-agnostic absjoin function and some long-paths win utils

2017-08-12 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1502481241 25200 # Fri Aug 11 12:54:01 2017 -0700 # Node ID 586870aa06799e2ef49a2be4c8feab1464ad54b1 # Parent 609606d217659e0a6c1cf6f907b6512be5340e57 util: add platform-agnostic absjoin function and some long-paths win

[PATCH 4 of 5 RFC] windows: add relpath which knows about \\?\ prefix

2017-08-12 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1502522597 25200 # Sat Aug 12 00:23:17 2017 -0700 # Node ID 85d8ab670c128337f27013168e3f57b037d7996e # Parent bac7b1ae4a0c998c57cea5eac51af66853779918 windows: add relpath which knows about \\?\ prefix We want to correctly

[PATCH 2 of 5 RFC] windows: teach dirstate and posixfile to understand long paths

2017-08-12 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1502522414 25200 # Sat Aug 12 00:20:14 2017 -0700 # Node ID a1c8f310a66ada40697c824f4621bb54c757e9fa # Parent 586870aa06799e2ef49a2be4c8feab1464ad54b1 windows: teach dirstate and posixfile to understand long paths diff

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

2017-08-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > rebase.py:392 > _('changesets'), total) > -p1, p2, base = defineparents(repo, rev, self.dest, > - self.state, > -