Page MenuHomePhabricator

Recent Activity

Yesterday

marmoute committed rHGf0a2c1972e81: copies: simplify chain loop.
copies: simplify chain loop
Sat, Oct 19, 1:43 PM
marmoute closed D7131: copies: simplify chain loop.
Sat, Oct 19, 1:38 PM
marmoute closed D7127: sidedatacopies: only fetch information once for merge.
Sat, Oct 19, 1:38 PM
marmoute committed rHG90213d027154: sidedatacopies: only fetch information once for merge.
sidedatacopies: only fetch information once for merge
Sat, Oct 19, 1:38 PM
marmoute closed D7124: copies: move from a copy on branchpoint to a copy on write approach.
Sat, Oct 19, 1:38 PM
marmoute closed D7076: copies: compute the exact set of revision to walk.
Sat, Oct 19, 1:38 PM
marmoute closed D7075: copies: add an explicit test using multiple roots.
Sat, Oct 19, 1:38 PM
marmoute committed rHGffd04bc9f57d: copies: move from a copy on branchpoint to a copy on write approach.
copies: move from a copy on branchpoint to a copy on write approach
Sat, Oct 19, 1:38 PM
marmoute committed rHG83bb1e89ab9b: copies: compute the exact set of revision to walk.
copies: compute the exact set of revision to walk
Sat, Oct 19, 1:38 PM
marmoute committed rHGdda9482f60d2: copies: add an explicit test using multiple roots.
copies: add an explicit test using multiple roots
Sat, Oct 19, 1:38 PM
marmoute closed D7074: sidedatacopies: fast path data fetching if revision has no sidedata.
Sat, Oct 19, 1:38 PM
marmoute committed rHG8a2925265402: sidedatacopies: fast path data fetching if revision has no sidedata.
sidedatacopies: fast path data fetching if revision has no sidedata
Sat, Oct 19, 1:38 PM
martinvonz added a comment to D7127: sidedatacopies: only fetch information once for merge.

Nice work on this series. It's all queued now.

Sat, Oct 19, 1:36 PM
mharbison72 added a reviewer for D7130: automation: avoid '~' in the temp directory on Windows: indygreg.
Sat, Oct 19, 1:21 PM
kevincox added a comment to D7116: rust-performance: introduce FastHashMap type alias for HashMap.

The following comparison shows that for input > 20 bytes, fnv has worse overall performance than xx

Sat, Oct 19, 8:14 AM
martinvonz added a comment to D7144: status: use unfiltered repo if we're getting status of working copy.

To reviewers: I only care about this patch (and its parent is needed for this to pass tests). Feel free to drop any other patches you don't like.

Sat, Oct 19, 3:43 AM
martinvonz created D7145: status: move initialization closer together.
Sat, Oct 19, 3:39 AM
martinvonz created D7144: status: use unfiltered repo if we're getting status of working copy.
Sat, Oct 19, 3:39 AM
martinvonz created D7139: largefiles: move lfstatus context manager to lfutil.
Sat, Oct 19, 3:38 AM
martinvonz created D7143: largefiles: avoid dynamically subclassing context instances.
Sat, Oct 19, 3:38 AM
martinvonz created D7141: largefiles: use context manager for wlock in repo.status() override.
Sat, Oct 19, 3:38 AM
martinvonz created D7142: largefiles: delete unused repo.status_nolfiles().
Sat, Oct 19, 3:38 AM
martinvonz created D7140: largefiles: allow "lfstatus" context manager to set value to False.
Sat, Oct 19, 3:38 AM
martinvonz added a comment to D7135: copies: filter out file already in parent in duplicatecopies().
In D7135#104894, @yuja wrote:
  • a/tests/test-issue1175.t

+++ b/tests/test-issue1175.t
@@ -82,7 +82,6 @@

continue: hg graft --continue
$ hg graft --continue
grafting 1:5974126fad84 "b1"
  • warning: can't find ancestor for 'b' copied from 'a'! $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' changeset: 3:376d30ccffc0 summary: b1

This test was added at a43fdf33a6be, which might need bad copy information.

Ah, so maybe the bug used to be incorrectly suppressed by the logic for finding the source in an old version. Thanks for digging that up. I somehow didn't think to check.

  • a/mercurial/copies.py

+++ b/mercurial/copies.py
@@ -810,10 +810,11 @@

  1. of the function is much faster (and is required for carrying copy
  2. metadata across the rebase anyway). exclude = pathcopies(repo[fromrev], repo[skiprev])

+ pctx = wctx.p1()

for dst, src in pycompat.iteritems(pathcopies(repo[fromrev], repo[rev])):
    if dst in exclude:
        continue
  • if dst in wctx:

+ if dst in wctx and dst not in pctx:

wctx[dst].markcopied(src)

Seems fine as we don't support hg rm b; hg cp a b case.

Yes, exactly. I should have mentioned that.

Sat, Oct 19, 2:12 AM
martinvonz added a comment to D7135: copies: filter out file already in parent in duplicatecopies().
In D7135#104894, @yuja wrote:
  • a/tests/test-issue1175.t

+++ b/tests/test-issue1175.t
@@ -82,7 +82,6 @@

continue: hg graft --continue
$ hg graft --continue
grafting 1:5974126fad84 "b1"
  • warning: can't find ancestor for 'b' copied from 'a'! $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' changeset: 3:376d30ccffc0 summary: b1

This test was added at a43fdf33a6be, which might need bad copy information.

Sat, Oct 19, 1:14 AM
martinvonz closed D7138: largefiles: use context manager for setting "lfstatus" on subrepos too.
Sat, Oct 19, 1:14 AM
martinvonz closed D7137: largefiles: reset "lfstatus" attribute to previous value in "finally".
Sat, Oct 19, 1:13 AM
martinvonz closed D7136: largefiles: add context manager for setting/clearing "lfstatus" attribute.
Sat, Oct 19, 1:13 AM
martinvonz committed rHG2cb787b65cf2: largefiles: use context manager for setting "lfstatus" on subrepos too.
largefiles: use context manager for setting "lfstatus" on subrepos too
Sat, Oct 19, 1:13 AM
martinvonz committed rHG013637f4812e: largefiles: reset "lfstatus" attribute to previous value in "finally".
largefiles: reset "lfstatus" attribute to previous value in "finally"
Sat, Oct 19, 1:13 AM
martinvonz committed rHG03dae1044edd: largefiles: add context manager for setting/clearing "lfstatus" attribute.
largefiles: add context manager for setting/clearing "lfstatus" attribute
Sat, Oct 19, 1:13 AM
yuja added a comment to D7135: copies: filter out file already in parent in duplicatecopies().
  • a/tests/test-issue1175.t

+++ b/tests/test-issue1175.t
@@ -82,7 +82,6 @@

continue: hg graft --continue
$ hg graft --continue
grafting 1:5974126fad84 "b1"
  • warning: can't find ancestor for 'b' copied from 'a'! $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' changeset: 3:376d30ccffc0 summary: b1
Sat, Oct 19, 1:09 AM

Fri, Oct 18

martinvonz created D7138: largefiles: use context manager for setting "lfstatus" on subrepos too.
Fri, Oct 18, 8:52 PM
martinvonz created D7137: largefiles: reset "lfstatus" attribute to previous value in "finally".
Fri, Oct 18, 8:51 PM
martinvonz created D7136: largefiles: add context manager for setting/clearing "lfstatus" attribute.
Fri, Oct 18, 8:51 PM
mharbison72 added a comment to D7132: tests: conditionalize a permission based test in test-hgrc.t.

726bd0b612a2 does the same thing.

Fri, Oct 18, 6:05 PM
martinvonz created D7135: copies: filter out file already in parent in duplicatecopies().
Fri, Oct 18, 5:24 PM
dlax committed rHGd0f89e8c615a: py3: adjust expected traceback in test-hook.t.
py3: adjust expected traceback in test-hook.t
Fri, Oct 18, 2:58 PM
dlax committed rHG3f1b4d1a90c3: tests: use non-reverse grep in traceback in test-hook.t.
tests: use non-reverse grep in traceback in test-hook.t
Fri, Oct 18, 2:58 PM
dlax committed rHGa973a75e92bf: py3: add Python 3 exception output to test-hook.t.
py3: add Python 3 exception output to test-hook.t
Fri, Oct 18, 2:58 PM