D5917: annotate: respect ui.relative-paths for "binary file" message

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5917 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D5915: cmdutil: migrate previously missed instances to uipathfn

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I seem to have missed these two instances in https://phab.mercurial-scm.org/rHG15f63ac122ea3ee97c67e868d055c3c310725fe4 (files: respect ui.relative-paths,

D5916: scmutil: respect ui.relative-paths in default match.badfn

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We should probably be passing in a uipathfn here instead, so the caller can get consistent output (between match.badfn and whatever else it prints). I think

D5914: cat: respect ui.relative-paths for "skipping missing subrepository"

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5914 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

D5913: addremove: use uipathfn instead of m.rel() for recorded similatity message

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When no path arguments are given to addremove, it generally prints absolute paths. However, before this patch, we would always print the "recording removal

D5911: forget: pass around uipathfn and use instead of m.rel() (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5911 AFFECTED FILES hgext/largefiles/overrides.py mercurial/cmdutil.py mercurial/commands.py

D5912: forget: use relative paths for --interactive

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Seems more consistent. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5912 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS

D5909: debugwalk: avoid match.rel() and use repo.pathto() instead

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm about to delete match.rel() REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5909 AFFECTED FILES mercurial/debugcommands.py

D5910: automv: respect ui.relative-paths

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5910 AFFECTED FILES hgext/automv.py CHANGE DETAILS diff --git a/hgext/automv.py b/hgext/automv.py

D5908: match: delete unused abs() (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5908 AFFECTED FILES mercurial/match.py CHANGE DETAILS diff --git a/mercurial/match.py

D5907: copy: respect ui.relative-paths in copy/rename

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13934. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5907?vs=13933=13934 REVISION DETAIL https://phab.mercurial-scm.org/D5907 AFFECTED FILES mercurial/cmdutil.py mercurial/scmutil.py tests/test-copy.t

D5907: copy: respect ui.relative-paths in copy/rename

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13933. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5907?vs=13932=13933 REVISION DETAIL https://phab.mercurial-scm.org/D5907 AFFECTED FILES mercurial/cmdutil.py mercurial/scmutil.py tests/test-copy.t

D5907: copy: respect ui.relative-paths in copy/rename

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5907 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py

D5906: match: delete unused uipath() and _uipathrelative (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5906 AFFECTED FILES mercurial/match.py CHANGE DETAILS diff --git a/mercurial/match.py

D5902: remove: pass around uipathfn and use instead of m.rel() (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13928. martinvonz retitled this revision from "remove: pass around uipathfn and use instead of m.rel()" to "remove: pass around uipathfn and use instead of m.rel() (API)". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5894: patch: replace "prefix" and "relroot" arguments by "pathfn" (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13927. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5894?vs=13908=13927 REVISION DETAIL https://phab.mercurial-scm.org/D5894 AFFECTED FILES mercurial/context.py mercurial/logcmdutil.py mercurial/patch.py

D5893: patch: accept second matcher that applies only to copy sources (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13926. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5893?vs=13907=13926 REVISION DETAIL https://phab.mercurial-scm.org/D5893 AFFECTED FILES mercurial/context.py mercurial/logcmdutil.py mercurial/patch.py

D5886: subrepo: adjust subrepo prefix before calling subrepo.diff() (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 13925. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5886?vs=13897=13925 REVISION DETAIL https://phab.mercurial-scm.org/D5886 AFFECTED FILES mercurial/logcmdutil.py mercurial/subrepo.py CHANGE DETAILS

D5903: addremove: pass around uipathfn and use instead of m.uipath()

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5903 AFFECTED FILES contrib/perf.py hgext/largefiles/overrides.py mercurial/cmdutil.py

D5901: add: pass around uipathfn and use instead of m.rel() (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY For now, the uipathfn we pass around always prints relative paths just like before, so this should have no effect. Well, there's one little change: I also

D5902: remove: pass around uipathfn and use instead of m.rel()

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Same as previous commit, but now for remove. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5902 AFFECTED FILES

D5904: largefiles: use uipathfn instead of match.{rel,uipath}()

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY All callers now pass in a uipathfn, so we can just use that instead of choosing the right match function. This also means that when we make add/remove

Re: [PATCH] convert: handle exec bit removal while converting to svn

2019-02-08 Thread Augie Fackler
queued, thanks > On Feb 7, 2019, at 14:21, Nikita Slyusarev wrote: > > # HG changeset patch > # User Nikita Slyusarev > # Date 1549565330 -10800 > # Thu Feb 07 21:48:50 2019 +0300 > # Node ID afd7bd1378b43b306567245ac0e394c4432e944d > # Parent 286eeed148932d53eab7193c8e5deda39f9131f9 >

Re: [PATCH] convert: handle empty intial commits while converting to svn

2019-02-08 Thread Augie Fackler
queued, thanks > On Feb 7, 2019, at 13:18, Nikita Slyusarev wrote: > > # HG changeset patch > # User Nikita Slyusarev > # Date 1549555074 -10800 > # Thu Feb 07 18:57:54 2019 +0300 > # Node ID bde6d4eed3104a49c9d4558907d1af4af8718ba1 > # Parent 67e622ade4155d89270ec7ce6928f5645317a5c1 >

D5900: subrepo: (mostly) use relative path in "skipping missing subrepository"

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is consistent with the other messages printed by these functions. Note that addremove is a little different and prints absolute (aka repo-relative)

D5899: subrepo: use relative path for "already tracked" message

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY From https://phab.mercurial-scm.org/rHG932de135041fc944af1c3df21ff251522f8236b6 (subrepo: warn when adding already tracked files in gitsubrepo, 2015-02-27):

D5746: status: introduce higher-level ui.relative-paths

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a subscriber: mharbison72. martinvonz added a comment. Btw, @mharbison72, I think now that we have this new `getuipathfn()`, we have a single place to update to get \-separated paths on Windows. I believe we should replace the `lambda f: f` by `platform.localpath`. That

D5898: debugignore: respect ui.relative-paths

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Not because I care about this, but I want to get rid of match.uipath() and it's easier to respect the config than not. REPOSITORY rHG Mercurial REVISION

D5897: test: stabilize test-wireproto-exchangev2.t flaky output

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. This test fails for me too quite frequently, so thanks for fixing! I've added indygreg as reviewer since they know this area best. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5897 To: lothiraldan, #hg-reviewers, indygreg Cc:

D5897: test: stabilize test-wireproto-exchangev2.t flaky output

2019-02-08 Thread lothiraldan (Boris Feld)
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When running the test suite with multiple processes, we often get flaky outputs, like here: https://ci.octobus.net/job/MercurialPy2/267/console -

mercurial@41612: 14 new changesets

2019-02-08 Thread Mercurial Commits
14 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/106b0bec162a changeset: 41599:106b0bec162a user:Martin von Zweigbergk date:Mon Feb 04 21:10:17 2019 -0800 summary: mq: migrate to scmutil.backuppath()

D5792: uncommit: added interactive mode(issue6062)

2019-02-08 Thread taapas1128 (Taapas Agrawal)
taapas1128 added a comment. @pulkit Apparently it seems removing `-n` flag altogether will not interfere with the tests and they can be completed without that flag too . I have added inline comments please review. INLINE COMMENTS > test-uncommit-interactive.t:134 > + > + >

[PATCH STABLE] subrepo: add test for Windows relative-ish path with drive letter

2019-02-08 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1549540241 -32400 # Thu Feb 07 20:50:41 2019 +0900 # Branch stable # Node ID adf01cdceea20b5ad6dacb11dbb1d94e5055e39c # Parent 87a6e3c953e045d92147925fc71aad7c327fdbfd subrepo: add test for Windows relative-ish path with drive letter Matt

D5792: uncommit: added interactive mode(issue6062)

2019-02-08 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 13915. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5792?vs=13738=13915 REVISION DETAIL https://phab.mercurial-scm.org/D5792 AFFECTED FILES hgext/uncommit.py tests/test-uncommit-interactive.t

D5638: branchmap: encapsulate cache updating in the map itself

2019-02-08 Thread mjpieters (Martijn Pieters)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG328ca3b9e545: branchmap: encapsulate cache updating in the map itself (authored by mjpieters, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5889: context: replace repeated "self._repo.dirstate" by "ds" variable

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfbd4ce55bcbd: context: replace repeated self._repo.dirstate by ds variable (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5888: context: delete unused undelete()

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4bf166a020a7: context: delete unused undelete() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5888?vs=13902=13912

D5890: diffordiffstat: avoid looking up contexts twice

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd683aca738cd: diffordiffstat: avoid looking up contexts twice (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH] py3: manually replace `None` with 'None' in ui.log() arguments

2019-02-08 Thread Yuya Nishihara
On Thu, 07 Feb 2019 17:55:47 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1549312475 18000 > # Mon Feb 04 15:34:35 2019 -0500 > # Node ID b6bdc25edf05318a4571b4f34a741754f5052567 > # Parent a263b7d71105414c9a1234414747533ce904ba39 > py3: manually

[Bug 6075] New: explicit GC on every request make repositories with thousands of largesfiles very slow to clone

2019-02-08 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6075 Bug ID: 6075 Summary: explicit GC on every request make repositories with thousands of largesfiles very slow to clone Product: Mercurial Version: 4.9 Hardware: All

D5894: patch: replace "prefix" and "relroot" arguments by "pathfn" (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The two arguments serve a very similar purpose: "relroot" is stripped from the front of the path, and then "prefix" (a subrepo path) is added (also to the

D5896: diff: make --stat respect ui.relative-paths

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It would have been easy to make all diffs respect ui.relative-paths, but we don't want that since it makes the diff invalid. Perhaps it makes sense to do

D5892: patch: let caller pass in root-filtering matcher (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The --root option to `hg diff` does two things: - Shows paths relative to the given root - Filters paths by the given root, including copy sources

D5895: diff: make `hg diff --root=subrepo` work

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The root prefix is currently stripped before adding the subrepo prefix. It seems to me that if you run `hg diff --root=subrepo` and a subrepo/ path is

D5891: patch: pass in context objects into diffhunks() (API)

2019-02-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It's a pretty low-level function and having the contexts in patch.diff() makes future patches easier. REPOSITORY rHG Mercurial REVISION DETAIL