Feed Advanced Search

Yesterday

martinvonz requested changes to D5410: merge: allow to merge non-conflicting changes outside narrowspec.

I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of hg merge to the time of hg commit. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.

Tue, Dec 11, 9:47 AM

Mon, Dec 10

martinvonz planned changes to D5275: tests: update store narrowspec when narrowspec, not dirstate, is accessed.

I had forgotten that I had even sent this for review. I have some changes in my repo that I will share in a while (after I've address Yuya's comments on D5278).

Mon, Dec 10, 4:59 PM

Sun, Dec 9

martinvonz closed D5398: narrow: keep bookmarks temporarily stripped for as long as commits are.
Sun, Dec 9, 7:06 AM
martinvonz committed rHG109a267acc1e: narrow: keep bookmarks temporarily stripped for as long as commits are.
narrow: keep bookmarks temporarily stripped for as long as commits are
Sun, Dec 9, 7:06 AM
martinvonz closed D5396: tests: test that narrow preserves bookmarks on widen.
Sun, Dec 9, 7:06 AM
martinvonz committed rHG0d50bfcd8f65: narrow: drop obsolete support for old Mercurial.
narrow: drop obsolete support for old Mercurial
Sun, Dec 9, 7:06 AM
martinvonz committed rHG21e7c73af75f: tests: test that narrow preserves bookmarks on widen.
tests: test that narrow preserves bookmarks on widen
Sun, Dec 9, 7:06 AM
martinvonz closed D5397: narrow: drop obsolete support for old Mercurial.
Sun, Dec 9, 7:06 AM
martinvonz created D5398: narrow: keep bookmarks temporarily stripped for as long as commits are.
Sun, Dec 9, 3:09 AM
martinvonz created D5397: narrow: drop obsolete support for old Mercurial.
Sun, Dec 9, 3:09 AM
martinvonz added a dependent revision for D5396: tests: test that narrow preserves bookmarks on widen: D5397: narrow: drop obsolete support for old Mercurial.
Sun, Dec 9, 3:09 AM
martinvonz added a dependent revision for D5397: narrow: drop obsolete support for old Mercurial: D5398: narrow: keep bookmarks temporarily stripped for as long as commits are.
Sun, Dec 9, 3:09 AM
martinvonz created D5396: tests: test that narrow preserves bookmarks on widen.
Sun, Dec 9, 3:09 AM
martinvonz closed D5395: rebase: clarify that commits that become empty are skipped.
Sun, Dec 9, 12:03 AM
martinvonz closed D5394: rebase: format commit in usual way when explaining that it became empty.
Sun, Dec 9, 12:03 AM
martinvonz committed rHG4edd427f34c1: rebase: clarify that commits that become empty are skipped.
rebase: clarify that commits that become empty are skipped
Sun, Dec 9, 12:02 AM
martinvonz committed rHG09680349cc2d: rebase: format commit in usual way when explaining that it became empty.
rebase: format commit in usual way when explaining that it became empty
Sun, Dec 9, 12:02 AM

Fri, Dec 7

martinvonz created D5395: rebase: clarify that commits that become empty are skipped.
Fri, Dec 7, 5:29 PM
martinvonz created D5394: rebase: format commit in usual way when explaining that it became empty.
Fri, Dec 7, 5:29 PM
martinvonz added a dependent revision for D5394: rebase: format commit in usual way when explaining that it became empty: D5395: rebase: clarify that commits that become empty are skipped.
Fri, Dec 7, 5:27 PM

Thu, Dec 6

martinvonz closed D5393: rebase: remove now-unnecessary arguments to _abort().
Thu, Dec 6, 7:09 AM
martinvonz closed D5391: cleanupnodes: trust caller when "moves" is not None.
Thu, Dec 6, 7:09 AM
martinvonz closed D5392: rebase: move abort() onto rebaseruntime.
Thu, Dec 6, 7:09 AM
martinvonz committed rHG2041991f1ce2: rebase: remove now-unnecessary arguments to _abort().
rebase: remove now-unnecessary arguments to _abort()
Thu, Dec 6, 7:09 AM
martinvonz committed rHGc8eb8d1fc6cf: rebase: move abort() onto rebaseruntime.
rebase: move abort() onto rebaseruntime
Thu, Dec 6, 7:09 AM
martinvonz committed rHG236af7cfa4c3: shelve: change transaction description from "commit" to "shelve".
shelve: change transaction description from "commit" to "shelve"
Thu, Dec 6, 7:09 AM
martinvonz committed rHGb7823bd59b07: cleanupnodes: trust caller when "moves" is not None.
cleanupnodes: trust caller when "moves" is not None
Thu, Dec 6, 7:09 AM
martinvonz closed D5390: shelve: change transaction description from "commit" to "shelve".
Thu, Dec 6, 7:09 AM
martinvonz closed D5388: tests: split test-shelve.t in two.
Thu, Dec 6, 7:09 AM
martinvonz committed rHGd7e44da4dc70: shelve: drop unnecessary backup of dirstate for phase-based case.
shelve: drop unnecessary backup of dirstate for phase-based case
Thu, Dec 6, 7:09 AM
martinvonz closed D5389: shelve: drop unnecessary backup of dirstate for phase-based case.
Thu, Dec 6, 7:09 AM
martinvonz committed rHG1b836cee2d91: tests: split test-shelve.t in two.
tests: split test-shelve.t in two
Thu, Dec 6, 7:09 AM
martinvonz closed D5386: remotefilelog: rely on progress helper for keeping track of position.
Thu, Dec 6, 6:41 AM
martinvonz committed rHG74e3df766052: remotefilelog: rely on progress helper for keeping track of position.
remotefilelog: rely on progress helper for keeping track of position
Thu, Dec 6, 6:41 AM
martinvonz committed rHGfcee112fb7c4: remotefilelog: reduce use of "count" container.
remotefilelog: reduce use of "count" container
Thu, Dec 6, 6:41 AM
martinvonz closed D5385: remotefilelog: reduce use of "count" container.
Thu, Dec 6, 6:41 AM
martinvonz closed D5384: remotefilelog: replace a "a=[expr]; b=a[0]" by "b=expr; a = [b]".
Thu, Dec 6, 6:41 AM
martinvonz committed rHGfe0b65ff00e7: remotefilelog: replace a "a=[expr]; b=a[0]" by "b=expr; a = [b]".
remotefilelog: replace a "a=[expr]; b=a[0]" by "b=expr; a = [b]"
Thu, Dec 6, 6:41 AM
martinvonz closed D5383: remotefilelog: remove an unnecessary update of "count" container.
Thu, Dec 6, 6:41 AM
martinvonz committed rHG70de33b9d328: remotefilelog: remove an unnecessary update of "count" container.
remotefilelog: remove an unnecessary update of "count" container
Thu, Dec 6, 6:41 AM
martinvonz closed D5382: remotefilelog: avoid temporarily using "count" variable as synonym for "total".
Thu, Dec 6, 6:41 AM
martinvonz committed rHGb34b1b865ef9: remotefilelog: avoid temporarily using "count" variable as synonym for "total".
remotefilelog: avoid temporarily using "count" variable as synonym for "total"
Thu, Dec 6, 6:41 AM
martinvonz closed D5381: remotefilelog: use progress helper in fileserverclient.
Thu, Dec 6, 6:41 AM
martinvonz committed rHGe58cd7ede1c3: remotefilelog: use progress helper in fileserverclient.
remotefilelog: use progress helper in fileserverclient
Thu, Dec 6, 6:41 AM
martinvonz closed D5380: remotefilelog: use progress helper in shallowrepo.
Thu, Dec 6, 6:41 AM
martinvonz committed rHGb6a6dc1a14bd: remotefilelog: use progress helper in shallowrepo.
remotefilelog: use progress helper in shallowrepo
Thu, Dec 6, 6:41 AM
martinvonz closed D5378: remotefilelog: use progress helper in repack.
Thu, Dec 6, 6:41 AM
martinvonz committed rHGb80915b52476: remotefilelog: use progress helper in repack.
remotefilelog: use progress helper in repack
Thu, Dec 6, 6:41 AM
martinvonz committed rHG4e08bbfc6d51: remotefilelog: use progress helper in shallowbundle.
remotefilelog: use progress helper in shallowbundle
Thu, Dec 6, 6:41 AM
martinvonz committed rHGfbd053af2eda: remotefilelog: use progress helper in remotefilelogserver.
remotefilelog: use progress helper in remotefilelogserver
Thu, Dec 6, 6:41 AM
martinvonz closed D5377: remotefilelog: use progress helper in remotefilelogserver.
Thu, Dec 6, 6:41 AM
martinvonz closed D5379: remotefilelog: use progress helper in shallowbundle.
Thu, Dec 6, 6:41 AM
martinvonz closed D5375: remotefilelog: use progress helper when analyzing repos.
Thu, Dec 6, 6:41 AM
martinvonz closed D5376: remotefilelog: use progress helper in basestore.
Thu, Dec 6, 6:41 AM
martinvonz committed rHG05afb32e9380: remotefilelog: use progress helper when analyzing repos.
remotefilelog: use progress helper when analyzing repos
Thu, Dec 6, 6:41 AM
martinvonz committed rHGad21fbcb1ba5: remotefilelog: use progress helper in basestore.
remotefilelog: use progress helper in basestore
Thu, Dec 6, 6:41 AM
martinvonz committed rHGdd1006874a5a: fastannotate: use progress helper.
fastannotate: use progress helper
Thu, Dec 6, 6:41 AM
martinvonz closed D5374: fastannotate: use progress helper.
Thu, Dec 6, 6:41 AM
martinvonz committed rHG901f6ef670ca: debugbuildannotatecache: use progress helper.
debugbuildannotatecache: use progress helper
Thu, Dec 6, 6:41 AM
martinvonz closed D5373: debugbuildannotatecache: use progress helper.
Thu, Dec 6, 6:40 AM
martinvonz created D5393: rebase: remove now-unnecessary arguments to _abort().
Thu, Dec 6, 12:14 AM
martinvonz created D5392: rebase: move abort() onto rebaseruntime.
Thu, Dec 6, 12:14 AM
martinvonz added a dependent revision for D5392: rebase: move abort() onto rebaseruntime: D5393: rebase: remove now-unnecessary arguments to _abort().
Thu, Dec 6, 12:14 AM
martinvonz created D5391: cleanupnodes: trust caller when "moves" is not None.
Thu, Dec 6, 12:12 AM

Wed, Dec 5

martinvonz created D5390: shelve: change transaction description from "commit" to "shelve".
Wed, Dec 5, 6:44 PM
martinvonz created D5388: tests: split test-shelve.t in two.
Wed, Dec 5, 6:44 PM
martinvonz created D5389: shelve: drop unnecessary backup of dirstate for phase-based case.
Wed, Dec 5, 6:44 PM
martinvonz added a dependent revision for D5389: shelve: drop unnecessary backup of dirstate for phase-based case: D5390: shelve: change transaction description from "commit" to "shelve".
Wed, Dec 5, 6:44 PM
martinvonz added a dependent revision for D5388: tests: split test-shelve.t in two: D5389: shelve: drop unnecessary backup of dirstate for phase-based case.
Wed, Dec 5, 6:44 PM
martinvonz created D5386: remotefilelog: rely on progress helper for keeping track of position.
Wed, Dec 5, 12:40 PM
martinvonz created D5385: remotefilelog: reduce use of "count" container.
Wed, Dec 5, 12:40 PM
martinvonz added a dependent revision for D5385: remotefilelog: reduce use of "count" container: D5386: remotefilelog: rely on progress helper for keeping track of position.
Wed, Dec 5, 12:40 PM
martinvonz created D5384: remotefilelog: replace a "a=[expr]; b=a[0]" by "b=expr; a = [b]".
Wed, Dec 5, 12:40 PM
martinvonz added a dependent revision for D5384: remotefilelog: replace a "a=[expr]; b=a[0]" by "b=expr; a = [b]": D5385: remotefilelog: reduce use of "count" container.
Wed, Dec 5, 12:40 PM
martinvonz created D5383: remotefilelog: remove an unnecessary update of "count" container.
Wed, Dec 5, 12:39 PM
martinvonz created D5382: remotefilelog: avoid temporarily using "count" variable as synonym for "total".
Wed, Dec 5, 12:39 PM
martinvonz created D5381: remotefilelog: use progress helper in fileserverclient.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5382: remotefilelog: avoid temporarily using "count" variable as synonym for "total": D5383: remotefilelog: remove an unnecessary update of "count" container.
Wed, Dec 5, 12:39 PM
martinvonz created D5380: remotefilelog: use progress helper in shallowrepo.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5381: remotefilelog: use progress helper in fileserverclient: D5382: remotefilelog: avoid temporarily using "count" variable as synonym for "total".
Wed, Dec 5, 12:39 PM
martinvonz created D5378: remotefilelog: use progress helper in repack.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5380: remotefilelog: use progress helper in shallowrepo: D5381: remotefilelog: use progress helper in fileserverclient.
Wed, Dec 5, 12:39 PM
martinvonz created D5379: remotefilelog: use progress helper in shallowbundle.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5379: remotefilelog: use progress helper in shallowbundle: D5380: remotefilelog: use progress helper in shallowrepo.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5377: remotefilelog: use progress helper in remotefilelogserver: D5378: remotefilelog: use progress helper in repack.
Wed, Dec 5, 12:39 PM
martinvonz created D5372: perfrevlogwrite: use progress helper.
Wed, Dec 5, 12:39 PM
martinvonz created D5375: remotefilelog: use progress helper when analyzing repos.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5378: remotefilelog: use progress helper in repack: D5379: remotefilelog: use progress helper in shallowbundle.
Wed, Dec 5, 12:39 PM
martinvonz created D5377: remotefilelog: use progress helper in remotefilelogserver.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5376: remotefilelog: use progress helper in basestore: D5377: remotefilelog: use progress helper in remotefilelogserver.
Wed, Dec 5, 12:39 PM
martinvonz created D5376: remotefilelog: use progress helper in basestore.
Wed, Dec 5, 12:39 PM
martinvonz created D5374: fastannotate: use progress helper.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5375: remotefilelog: use progress helper when analyzing repos: D5376: remotefilelog: use progress helper in basestore.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5374: fastannotate: use progress helper: D5375: remotefilelog: use progress helper when analyzing repos.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5373: debugbuildannotatecache: use progress helper: D5374: fastannotate: use progress helper.
Wed, Dec 5, 12:39 PM
martinvonz created D5373: debugbuildannotatecache: use progress helper.
Wed, Dec 5, 12:39 PM
martinvonz added a dependent revision for D5372: perfrevlogwrite: use progress helper: D5373: debugbuildannotatecache: use progress helper.
Wed, Dec 5, 12:39 PM
martinvonz closed D5364: narrow: don't resurrect old commits when narrowing (don't strip obsmarkers).
Wed, Dec 5, 6:57 AM
martinvonz committed rHG23dc23897248: tests: drop redundant "#if execbit" from test-rebase-inmemory.t.
tests: drop redundant "#if execbit" from test-rebase-inmemory.t
Wed, Dec 5, 6:57 AM
martinvonz committed rHG77173267878b: narrow: don't resurrect old commits when narrowing (don't strip obsmarkers).
narrow: don't resurrect old commits when narrowing (don't strip obsmarkers)
Wed, Dec 5, 6:57 AM