D741: rebase: also include other namespaces in changeset description

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes use of the generic method of listing bookmarks and tags, so other extensions that add other namespaces will get their names added too. This

D657: revset: move weight information to predicate

yuja accepted this revision. yuja added a comment. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D657 To: quark, #hg-reviewers, phillco, krbullock, singhsrb, yuja Cc: krbullock, yuja, phillco, mercurial-devel

D727: rebase: move bookmarks with --keep (issue5682)

martinvonz added a comment. I'm tired, so I don't think I reviewed this properly, but seemed to make sense. INLINE COMMENTS > rebase.py:547-549 > if not self.keepf: > -collapsedas = None > if self.collapsef: > collapsedas = newnode Can

D656: revset: remove "small" argument from "_optimize"

lothiraldan added a comment. In https://phab.mercurial-scm.org/D656#12341, @quark wrote: > In https://phab.mercurial-scm.org/D656#12304, @yuja wrote: > > > (copied from the email thread) > > > I saw your email (and the next one). The commit message was updated accordingly. I

D722: obsmarker: track operation by default

lothiraldan added a comment. Did you activated it at Facebook? Do you have some number on the size with and without it? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D722 To: martinvonz, #hg-reviewers, quark Cc: lothiraldan, quark, mercurial-devel

D723: templates: introduce a obsfateoperation() function

lothiraldan added a comment. I'm +1 with "rewritten using amend as". I find it useful as a complement to the verb. I'm -0 with "split using amend, rebase as". It find it harder to read and understand even if it brings some value. REPOSITORY rHG Mercurial REVISION DETAIL

D750: rebase: move bookmarks with --keep (issue5682)

martinvonz updated this revision to Diff 1940. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D750?vs=1938=1940 REVISION DETAIL https://phab.mercurial-scm.org/D750 AFFECTED FILES hgext/rebase.py mercurial/scmutil.py tests/test-rebase-bookmarks.t

D723: templates: introduce a obsfateoperation() function

quark added a comment. +1 for changing the words. I think it should be just "split as " or "amend as " etc without the word "rewritten". People want the "rewritten" word could customize their own templates. REPOSITORY rHG Mercurial REVISION DETAIL

D612: command: add a cmdtype argument to registrar.command

durin42 added a comment. In https://phab.mercurial-scm.org/D612#12426, @pulkit wrote: > Resend the series as https://phab.mercurial-scm.org/D736, https://phab.mercurial-scm.org/D737 and https://phab.mercurial-scm.org/D738. Can we discard this one then? It looks like those

D740: tersestatus: sort the dictionary before iterating on it

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1d6558f5ea74: tersestatus: sort the dictionary before iterating on it (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D741: rebase: also include other namespaces in changeset description

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4f969b9e0cf5: rebase: also include other namespaces in changeset description (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D746: changegroup: remove dictionary creation from deltachunk

This revision was automatically updated to reflect the committed changes. Closed by commit rHG05131c963767: changegroup: remove dictionary creation from deltachunk (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D745: bundlerepo: update to use new deltaiter api

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0fe62d8bdd50: bundlerepo: update to use new deltaiter api (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D745?vs=1933=1944

D744: debug: update debugbundle to use new deltaiter api

This revision was automatically updated to reflect the committed changes. Closed by commit rHG311f6ccf8f23: debug: update debugbundle to use new deltaiter api (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D730: revlog: add revmap back to revlog.addgroup

This revision was automatically updated to reflect the committed changes. durham marked an inline comment as done. Closed by commit rHG1db9abf407c5: revlog: add revmap back to revlog.addgroup (authored by durham, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D743: ui: check for progress singleton when clearing progress bar (issue5684)

mbthomas updated this revision to Diff 1939. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D743?vs=1917=1939 REVISION DETAIL https://phab.mercurial-scm.org/D743 AFFECTED FILES mercurial/ui.py tests/test-subrepo-deep-nested-change.t CHANGE DETAILS

mercurial@34271: 14 new changesets

14 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/e71890f27767 changeset: 34258:e71890f27767 user:Durham Goode date:Thu Sep 14 10:20:05 2017 -0700 summary: bundle2: move processpart stream maintenance into part iterator

D745: bundlerepo: update to use new deltaiter api

durham 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/D745 AFFECTED FILES mercurial/bundlerepo.py CHANGE DETAILS diff --git a/mercurial/bundlerepo.py

D746: changegroup: remove dictionary creation from deltachunk

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously delta chunk returned a dictionary. Now that we consume deltachunk within changegroup (instead of outside in revlog) we can just return a tuple and

D744: debug: update debugbundle to use new deltaiter api

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Changegroup now has a deltaiter api for easy iteration over a series of deltas. Let's use that in the debugbundle command. REPOSITORY rHG Mercurial REVISION

D722: obsmarker: track operation by default

quark added a comment. In https://phab.mercurial-scm.org/D722#12461, @lothiraldan wrote: > Did you activated it at Facebook? Do you have some number on the size with and without it? Facebook has been using it since Apr 2016:

D727: rebase: move bookmarks with --keep (issue5682)

martinvonz added inline comments. INLINE COMMENTS > scmutil.py:588-592 > +mapping is {oldnode: {'new': [newnode], 'move': newnode}}, where 'new' > +decide obsolete markers, and 'move' decide bookmark move, which could be > +different from new. If 'move' is not provided, it will be

D723: templates: introduce a obsfateoperation() function

martinvonz added a comment. In https://phab.mercurial-scm.org/D723#12507, @quark wrote: > +1 for changing the words. I think it should be just "split as " or "amend as " etc without the word "rewritten". People want the "rewritten" word could customize their own templates.

D750: rebase: move bookmarks with --keep (issue5682)

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is my version of Jun's https://phab.mercurial-scm.org/D727. Not meant to be accepted, but instead possibly incorporated into Jun's patch. REPOSITORY

D674: filemerge: use arbitraryfilectx for backup files

durin42 added a comment. One extra comment: maybe include some "why" as well as "what" in your commit message. :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D674 To: phillco, #hg-reviewers Cc: durin42, sid0, martinvonz, mercurial-devel

D749: cleanupnodes: rename "mapping" to "replacements"

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The next patch will pass in overrides for bookmark moves, which is a mapping itself, so let's rename "mapping" to "replacements" to distinguish them better.

Re: [PATCH 6 of 6] tests: avoid repr in test-bundle2-format.t

> On Sep 20, 2017, at 10:11, Yuya Nishihara wrote: > > On Wed, 20 Sep 2017 07:22:35 +0530, Pulkit Goyal wrote: >> The series looks good to me. >> >> On Tue, Sep 19, 2017 at 9:38 PM, Augie Fackler wrote: >>> # HG changeset patch >>> # User Augie Fackler

D723: templates: introduce a obsfateoperation() function

quark added a comment. In https://phab.mercurial-scm.org/D723#12511, @martinvonz wrote: > This is just a test case, do we really care that much? (I don't :-)) No. I thought there is a default template. But there isn't. REPOSITORY rHG Mercurial REVISION DETAIL

D477: revlog: add option to mmap revlog index

durin42 requested changes to this revision. durin42 added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > revlog.py:348 > +self.opener.fstat(f).st_size >= mmapindexthreshold): > +indexdata = util.buffer(util.mmapread(f)) > +

D476: util: add an mmapread method

durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. Either this or https://phab.mercurial-scm.org/D477 needs updating per the comment I made there. I'm just too nervous about the potential for silent mysterious changelog read

D726: uncommit: rename the flag 'empty' to 'keep' which retains empty changeset

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf94442d46984: uncommit: rename the flag empty to keep which retains empty changeset (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D734: uncommit: don't allow bare uncommit on dirty working directory

This revision was automatically updated to reflect the committed changes. Closed by commit rHG624c53e4121d: uncommit: dont allow bare uncommit on dirty working directory (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D743: ui: check for progress singleton when clearing progress bar (issue5684)

durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. Fails test-subrepo-deep-nested-change.t, but otherwise looks good. Fix up test failures? (I think you just need to update the expected behavior.) REPOSITORY rHG Mercurial

[Bug 5685] New: backup files can clobber tracked file contents

https://bz.mercurial-scm.org/show_bug.cgi?id=5685 Bug ID: 5685 Summary: backup files can clobber tracked file contents Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED

D730: revlog: add revmap back to revlog.addgroup

durham marked an inline comment as done. durham added a comment. I've updated the message and attached 3 more commits to the stack that update debugbundle, bundlerepo, and the deltachunk fix you suggested. INLINE COMMENTS > martinvonz wrote in changegroup.py:191-192 > I'll repeat my comment

mercurial@34273: 2 new changesets

2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/53fb09c73ba8 changeset: 34272:53fb09c73ba8 user:Jun Wu date:Fri Sep 01 19:30:40 2017 -0700 summary: revset: remove "small" argument from "_optimize"

D757: dirstate: move opendirstatefile to dirstatemap

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of moving the dirstate storage logic to another class, let's move opendirstatefile to dirstatemap. This will allow extensions to replace the pending

D756: dirstate: move _copymap to dirstatemap

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of moving all dirstate storage to a new class, let's move the copymap onto that class. In a future patch this will let us move the read/write functions

D759: dirstate: move parents source of truth to dirstatemap

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of moving dirstate storage to its own class, let's move the source of truth for the dirstate parents to dirstatemap. This requires that dirstate._pl no

D752: dirstate: create new dirstatemap class

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is part of a larger refactor to move the dirstate storage logic to a separate class, so it's easier to rewrite the dirstate storage layer without having to

D758: dirstate: move parent reading to the dirstatemap class

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of moving dirstate storage logic to a separate class, let's move the function that reads the parents from the file. This will allow extensions to write

D754: dirstate: move filefoldmap to dirstatemap

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of moving the dirstate storage logic to a separate class, lets move the filfoldmap computation to that class. This will allow extensions to replace the

D753: dirstate: move nonnormalentries to dirstatemap

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As part of moving dirstate storage to its own class, let's move the nonnormalentries logic onto the dirstatemap class. This will let extensions replace the

D752: dirstate: create new dirstatemap class

durham added a comment. This series is the first 8 commits of a 20 patch series. At the end all the storage for the dirstate goes through the dirstatemap class. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D752 To: durham, #hg-reviewers Cc: mercurial-devel

D674: filemerge: use arbitraryfilectx for backup files

martinvonz added inline comments. INLINE COMMENTS > context.py:701-705 > +class abstractfilectx(object): > +def data(self): > +raise NotImplementedError > + > +class basefilectx(abstractfilectx): abstractfilectx doesn't seem referenced anywhere else, so just revert this part? Maybe

Re: [PATCH 6 of 6 v2] paths: allow util.finddirs touse os.path.sep

> On Sep 20, 2017, at 12:46 PM, Augie Fackler wrote: > >> On Tue, Sep 19, 2017 at 09:57:50AM -0700, Kostia Balytskyi wrote: >> # HG changeset patch >> # User Kostia Balytskyi >> # Date 1505837708 25200 >> # Tue Sep 19 09:15:08 2017 -0700 >> # Node ID

[Bug 5686] New: evolve should move onto tipmost non-obsolete commit among successors of split parent

https://bz.mercurial-scm.org/show_bug.cgi?id=5686 Bug ID: 5686 Summary: evolve should move onto tipmost non-obsolete commit among successors of split parent Product: Mercurial Version: default branch Hardware: PC

Re: [PATCH] convert: parse quoted keys and values in mapfiles

On Mon, 18 Sep 2017 22:16:49 -0400, Matt Harbison wrote: > On Mon, 18 Sep 2017 16:28:45 -0400, Ingmar Blonk > wrote: > > > # HG changeset patch > > # User Ingmar Blonk > > # Date 1505662991 -7200 > > # Sun Sep 17 17:43:11 2017 +0200 > > #

[Bug 5684] New: Wrapped ui doesn't clear progress bar when exception occurs

https://bz.mercurial-scm.org/show_bug.cgi?id=5684 Bug ID: 5684 Summary: Wrapped ui doesn't clear progress bar when exception occurs Product: Mercurial Version: unspecified Hardware: PC OS: Linux

D743: ui: check for progress singleton when clearing progress bar (issue5684)

mbthomas created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A combination of wrapping `ui` and progress bars interrupted by exceptions can lead to the progress bar not being cleared when the exception error is printed.

Re: [PATCH 6 of 6] tests: avoid repr in test-bundle2-format.t

On Wed, 20 Sep 2017 07:22:35 +0530, Pulkit Goyal wrote: > The series looks good to me. > > On Tue, Sep 19, 2017 at 9:38 PM, Augie Fackler wrote: > > # HG changeset patch > > # User Augie Fackler > > # Date 1505758787 14400 > > # Mon Sep 18 14:19:47 2017

D723: templates: introduce a obsfateoperation() function

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7cdc8c5a481a: templates: introduce a obsfateoperation() function (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D625: copytrace: use the full copytracing method if only drafts are involved

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfc3b8483c6cb: copytrace: use the full copytracing method if only drafts are involved (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D735: uncommit: add an experimental.uncommitondirtywdir config

This revision was automatically updated to reflect the committed changes. Closed by commit rHG7b1e524ad73f: uncommit: add an experimental.uncommitondirtywdir config (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D654: blackbox: unindent a try block

yuja accepted this revision. yuja added a comment. This revision is now accepted and ready to land. Queued the series, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D654 To: quark, #hg-reviewers, durham, yuja Cc: yuja, mercurial-devel

D655: blackbox: set lastui even if ui.log is not called (issue5518)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb90bd9a98c8b: blackbox: set lastui even if ui.log is not called (issue5518) (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D656: revset: remove "small" argument from "_optimize"

This revision was automatically updated to reflect the committed changes. Closed by commit rHG53fb09c73ba8: revset: remove small argument from _optimize (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D656?vs=1881=1918

D657: revset: move weight information to predicate

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb0790bebfcf8: revset: move weight information to predicate (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D657?vs=1896=1919

D654: blackbox: unindent a try block

This revision was automatically updated to reflect the committed changes. Closed by commit rHG86a5df995880: blackbox: unindent a try block (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D654?vs=1897=1921 REVISION DETAIL

D680: scmutil: handle conflicting files and dirs in origbackuppath

mbthomas added inline comments. INLINE COMMENTS > ikostia wrote in scmutil.py:570 > I think we should adjust `finddirs` to split on `os.path.sep`, not hardcoded > `/`, then we can get rid of `util.normpath` a couple of lines above. > > I am long overdue with re-sending my series, I will add