In D5801#87300, @mharbison72 wrote:In D5801#87296, @martinvonz wrote:I noticed another bug and sent D5978. Maybe your test failure is because you're using the eol extension? I don't know what else would cause the \r in contrib.perf. I have no idea how that's related to this patch, though.
The \r is how output normally is on Windows. The test harness accounts for this when matching lines, but displays the actual output (with \r) when there are differences. The eol extension isn’t configured on this machine, but the custom HGRCPATH content from the test harness would override that anyway.
- Queries
- All Stories
- Search
- Advanced Search
Feed Advanced Search
Advanced Search
Advanced Search
Today
Today
Yesterday
Yesterday
In D5801#87273, @mharbison72 wrote:For some reason, this breaks test-contrib-perf.t:
I also tried setting True and False in ui.relative-paths, to no effect. Any ideas?
In D5898#87275, @mharbison72 wrote:This seems to have converted a test from dos to unix style. I'm not sure if that was intentional, or if this feature is still a WIP. (Sorry, I've been busy lately, and haven't had time to follow this closely)
Fri, Feb 15
Fri, Feb 15
martinvonz added inline comments to D5969: uncommit: inform user if the commit is empty after uncommit.
martinvonz added inline comments to D5969: uncommit: inform user if the commit is empty after uncommit.
martinvonz added inline comments to D5969: uncommit: inform user if the commit is empty after uncommit.
martinvonz added inline comments to D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977).
martinvonz added a dependent revision for D5969: uncommit: inform user if the commit is empty after uncommit: D5970: uncommit: add config option to keep commit by default.
martinvonz added inline comments to D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977).
martinvonz added inline comments to D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977).
Thu, Feb 14
Thu, Feb 14
martinvonz accepted D5967: chistedit: improve proper username in histedit curses interface
in changeset section (issue6072).
Looks like there's plenty of space there to show the full username. I suspect it was the way it was because it came from FB where just the username is enough to identify people.
scmutil: fix a comment that doesn't match the code
scmutil: fix a comment that doesn't match the code
Wed, Feb 13
Wed, Feb 13
debugpathcopies: fix typo in synopsis
debugrename: don't require at least one path
commit: respect ui.relative-paths
resolve: respect ui.relative-paths also for warning messages
martinvonz committed rHGfee1a4935c27: resolve: slightly simplify join expression by joining with empty strings.
resolve: slightly simplify join expression by joining with empty strings
addremove: respect ui.relative-paths
In D5936#86976, @martinvonz wrote:Ironic given the subject line that I missed this hunk:
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -256,7 +256,7 @@ def addremove(ui, repo, *pats, **opts): opts['similarity'] = '100' matcher = scmutil.match(repo[None], pats, opts) relative = scmutil.anypats(pats, opts) - uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative) + uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative) return scmutil.addremove(repo, matcher, "", uipathfn, opts) @command('annotate|blame',I'll fold that in in flight since the commit is not yet public.
Ironic given the subject line that I missed this hunk:
debugpathcopies: fix typo in synopsis
debugrename: don't require at least one path
martinvonz committed rHGc31dd7b63ab3: resolve: slightly simplify join expression by joining with empty strings.
resolve: slightly simplify join expression by joining with empty strings
commit: respect ui.relative-paths
resolve: respect ui.relative-paths also for warning messages
addremove: respect ui.relative-paths
martinvonz committed rHGa8d3a4be066e: windows: use util.localpath for repo-relative paths in getuipathfn().
windows: use util.localpath for repo-relative paths in getuipathfn()
martinvonz retitled D5949: debugpathcopies: fix typo in synopsis from debugpathcopies: fix typo in synpsis to debugpathcopies: fix typo in synopsis.
Tue, Feb 12
Tue, Feb 12
In D5949#86909, @martinvonz wrote:In D5949#86908, @JordiGH wrote:So, I haven't been here in a while. Do we still do V2s for this kind of thing?
Often fixed in n flight. I'll still fix it later tonight if I remember.
In D5949#86908, @JordiGH wrote:So, I haven't been here in a while. Do we still do V2s for this kind of thing?
In D5949#86905, @JordiGH wrote:fix typo in synpsis
in synpsis
synpsis
martinvonz added a dependent revision for D5948: debugrename: don't require at least one path: D5949: debugpathcopies: fix typo in synopsis.
Mon, Feb 11
Mon, Feb 11
martinvonz added a dependent revision for D5938: resolve: slightly simplify join expression by joining with empty strings: D5939: commit: respect ui.relative-paths.
martinvonz added a dependent revision for D5936: addremove: respect ui.relative-paths: D5937: resolve: respect ui.relative-paths also for warning messages.
martinvonz added a dependent revision for D5935: windows: use util.localpath for repo-relative paths in getuipathfn(): D5936: addremove: respect ui.relative-paths.
In D5907#86706, @yuja wrote:`getuipathfn()` uses `repo.pathto()` when a relative path was requested (including by setting `legacyrelativevalue=True` or `forcerelativevalue=True`), so I think there shouldn't be much change in behavior with that commit.But the default of hg status is relative=False, so the status output
would have significant change on Windows.
martinvonz committed rHG0531dff73d0b: match: delete unused root and cwd arguments from {always,never,exact}() (API).
match: delete unused root and cwd arguments from {always,never,exact}() (API)
martinvonz committed rHGddbebce94665: match: delete unused root and cwd arguments to constructors (API).
match: delete unused root and cwd arguments to constructors (API)
dirstate: call and cache os.getcwd() in constructor
martinvonz committed rHG1db5ae4b0dda: cleanup: prefer matchmod.{always,never}() over accessing matchers directly.
cleanup: prefer matchmod.{always,never}() over accessing matchers directly
match: allow passing in badfn to always() and never()
martinvonz added a dependent revision for D5928: dirstate: call and cache os.getcwd() in constructor: D5929: match: delete unused root and cwd arguments to constructors (API).
In D5907#86625, @yuja wrote:> It might > break some Windows tests, but it should already be broken since https://phab.mercurial-scm.org/rHGa997163e7fae2fe933f8d0c6d1013205befd1ee4. > Some (or all?) `uipathfn()`s have to respect `ui.slash` config on Windows. Did that commit change any behavior on Windows?Probably. pathto(f, cwd='') would return backslash path on Windows.
Sun, Feb 10
Sun, Feb 10
diff: make --stat respect ui.relative-paths
martinvonz committed rHGa13268524c25: match: delete unused argument "listsubrepos" from _buildmatch().
match: delete unused argument "listsubrepos" from _buildmatch()
match: delete unused rel() (API)
martinvonz committed rHG8fa1a5fb8a28: largefiles: get cwd and relative paths from repo instead of matcher.
largefiles: get cwd and relative paths from repo instead of matcher
martinvonz committed rHGa950b65cbe1b: scmutil: remove special handling of pats==("",) in matchandpats() (API).
scmutil: remove special handling of pats==("",) in matchandpats() (API)
martinvonz added a dependent revision for D5923: match: delete unused rel() (API): D5924: match: delete unused argument "listsubrepos" from _buildmatch().
martinvonz added a dependent revision for D5896: diff: make --stat respect ui.relative-paths: D5921: scmutil: remove special handling of pats==("",) in matchandpats() (API).