Re: [PATCH 06 of 10 py3] bundle2: use modern Python division

> On Aug 14, 2017, at 14:17, Martin von Zweigbergk > wrote: > > On Tue, Aug 1, 2017 at 1:34 PM, Augie Fackler wrote: >> # HG changeset patch >> # User Augie Fackler >> # Date 1500909456 14400 >> # Mon Jul 24 11:17:36 2017 -0400

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco added a comment. > Forget about my comment on the commit message, I was fooled by phabricator Did you make one? I only see the two inline ones. INLINE COMMENTS > lothiraldan wrote in util.py:1898 > Why not passing the date and tz as separate argument instead of a tuple? I

D370: templatefilters: add `reldate` for human-style relative dates

akushner added a comment. There's already a date|age template feature that does this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D370 To: phillco, #hg-reviewers Cc: akushner, mercurial-devel ___ Mercurial-devel

Re: [PATCH 06 of 10 py3] bundle2: use modern Python division

On Tue, Aug 1, 2017 at 1:34 PM, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1500909456 14400 > # Mon Jul 24 11:17:36 2017 -0400 > # Node ID 4c1f4e109bf90a8352a25a6b45a80fabcac6306b > # Parent

D385: drawdag: allow override file contents via comments

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0531ffd59a98: drawdag: allow override file contents via comments (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D385?vs=872=874 REVISION

D370: templatefilters: add `reldate` for human-style relative dates

phillco added a comment. Heh, whoops. It didn't come up for searches of "relative" or "relative date". I'll abandon this revision but the one right before it is probably still worth including. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D370 To:

D122: phabricator: add --amend option to phabsend

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfa3aa6c98bb7: phabricator: add --amend option to phabsend (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D122?vs=838=873 REVISION DETAIL

[Bug 5658] New: I/O error writing to stdout/stderr can lead to abandoned transactions

https://bz.mercurial-scm.org/show_bug.cgi?id=5658 Bug ID: 5658 Summary: I/O error writing to stdout/stderr can lead to abandoned transactions Product: Mercurial Version: 4.2.2 Hardware: All OS: All

mercurial@33709: 28 new changesets

28 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/1d5e497c08b3 changeset: 33682:1d5e497c08b3 user:Yuya Nishihara date:Thu Aug 03 23:02:32 2017 +0900 summary: py3: convert arbitrary exception object to byte string more reliably

D388: filemerge: extract _maketemp and _makebackup

phillco 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/D388 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

[PATCH 2 of 2 STABLE] transaction: ignore I/O errors during abort logging (issue5658)

# HG changeset patch # User Gregory Szorc # Date 1502742785 25200 # Mon Aug 14 13:33:05 2017 -0700 # Branch stable # Node ID 7e80460cf08e68d812c0e2e662e3b93201cafe4f # Parent 0a33f202bca4ee7ea126e7638bb74b5d58775858 transaction: ignore I/O errors during abort

[PATCH 1 of 2 STABLE] tests: demonstrate that I/O error can lead to orphaned transaction (issue5658)

# HG changeset patch # User Gregory Szorc # Date 1502741560 25200 # Mon Aug 14 13:12:40 2017 -0700 # Branch stable # Node ID 0a33f202bca4ee7ea126e7638bb74b5d58775858 # Parent 7686cbb0ba4138c56d038d8d82ccc052bf9b60d7 tests: demonstrate that I/O error can lead to

D401: filemerge: add `_workingpath`

phillco updated this revision to Diff 911. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=910=911 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

mercurial@33681: 12 new changesets

12 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/e5f8c7baa729 changeset: 33670:e5f8c7baa729 parent: 33667:03039ff3082b user:Augie Fackler date:Mon Jul 24 10:21:23 2017 -0400 summary: obsolete: reuse _fm1metapair for computing

D401: filemerge: reduce creation of tempfiles until needed

phillco 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/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

phillco updated this revision to Diff 910. phillco edited the summary of this revision. phillco retitled this revision from "filemerge: reduce creation of tempfiles until needed" to "filemerge: add `_workingpath`". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D403: filemerge: reduce creation of tempfiles until needed

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This restricts the creation of temporary files to just `_xmerge`, when we call an external tool. REPOSITORY rHG Mercurial REVISION DETAIL

[Bug 5659] New: latesttag et al pick wrong tag when on current hg default

https://bz.mercurial-scm.org/show_bug.cgi?id=5659 Bug ID: 5659 Summary: latesttag et al pick wrong tag when on current hg default Product: Mercurial Version: 4.3 Hardware: PC OS: Mac OS Status:

Re: [PATCH 2 of 2 STABLE] transaction: ignore I/O errors during abort logging (issue5658)

Thanks for root causing this! There are a few other "self.report" calls. Maybe change "report" in __init__? I also suspect if we want to swallow other exceptions "report" may raise. def __init__(self, report, ...): def safereport(msg): try: report(msg)

D360: log: add a "graphwidth" template variable

yuja added a comment. > I had avoided this change because it might break extensions with their own edgefns. Do you think that's a concern? It's probably okay to change the function interface. I don't think the current `edgefn` is any useful for extensions. And I heard no problem after

D392: util: add base class for transactional context managers

indygreg requested changes to this revision. indygreg added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > util.py:597-601 > +def close(self): > +raise NotImplementedError > + > +def release(self): > +raise NotImplementedError How do

mercurial@33750: 41 new changesets

41 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/2e43c5cd57a7 changeset: 33710:2e43c5cd57a7 user:Augie Fackler date:Tue Aug 08 15:07:05 2017 -0400 summary: tests: fix up test-run-tests failures on Python 3.6

D342: rebase: change "result would have 3 parent" error message (BC)

quark updated this revision to Diff 892. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D342?vs=831=892 REVISION DETAIL https://phab.mercurial-scm.org/D342 AFFECTED FILES hgext/rebase.py tests/test-rebase-brute-force.t tests/test-rebase-obsolete.t

RE: D243: obsmarker: rename precnode into prednode

> -Original Message- > From: Mercurial-devel [mailto:mercurial-devel-boun...@mercurial-scm.org] > On Behalf Of lothiraldan (Boris Feld) > Sent: Wednesday, August 9, 2017 7:20 PM > To: mercurial-devel@mercurial-scm.org > Subject: D243: obsmarker: rename precnode into prednode > >

D243: obsmarker: rename precnode into prednode

yuja added inline comments. INLINE COMMENTS > lothiraldan wrote in cmdutil.py:1916 > I'm not sure to see which template keyword you are talking about. `fm.write('prednode', ...)` REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D243 To: lothiraldan, #hg-reviewers,

D391: exchange: remove need for "locked" variable

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The transactionmanager() constructor just assigned a few variables and cannot fail, so it's safe to move it inside the earlier try/except. REPOSITORY rHG

D392: util: add base class for transactional context managers

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have at least three types with a close() and a release() method where the close() method is supposed to be called on success and the release() method is

D389: exchange: remove 'locallocked' member from pushop object

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The variable has been used only within a single function since https://phab.mercurial-scm.org/rHG94e2862dbcfb0f26ade829dc6df7d7d60e14aa10 (push: elevate phase

D390: exchange: drop now-unnecessary "local" from lock name variables

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since https://phab.mercurial-scm.org/rHGfda0867cfe03ebf457c12b7e0ff1b174aeb67759 (exchange: drop support for lock-based unbundling (BC), 2017-08-06), there

D23: rebase: move obsoleted not rebased messages earlier (BC)

quark updated this revision to Diff 894. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D23?vs=832=894 REVISION DETAIL https://phab.mercurial-scm.org/D23 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D26: rebase: remove revignored and nullmerge states

quark updated this revision to Diff 897. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D26?vs=834=897 REVISION DETAIL https://phab.mercurial-scm.org/D26 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D25: rebase: remove messages for nullmerge and revignored (BC)

quark updated this revision to Diff 896. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D25?vs=774=896 REVISION DETAIL https://phab.mercurial-scm.org/D25 AFFECTED FILES hgext/rebase.py tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t

D24: rebase: remove revprecursor and revpruned states (BC)

quark updated this revision to Diff 895. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D24?vs=833=895 REVISION DETAIL https://phab.mercurial-scm.org/D24 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D347: rebase: rewrite _computeobsoletenotrebased

quark updated this revision to Diff 899. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D347?vs=835=899 REVISION DETAIL https://phab.mercurial-scm.org/D347 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

[PATCH 1 of 2] test-sparse: drop unnecessary globs

# HG changeset patch # User Matt Harbison # Date 1502763653 14400 # Mon Aug 14 22:20:53 2017 -0400 # Node ID 1a077f01241b6256728751b00c552652d024c907 # Parent a0e28577f7d4c0d51cd075ddaaa3cd32d3380545 test-sparse: drop unnecessary globs diff --git

[PATCH 2 of 2] test-pushvars: invoke shell script hook via `sh` for Windows

# HG changeset patch # User Matt Harbison # Date 1502764008 14400 # Mon Aug 14 22:26:48 2017 -0400 # Node ID 26abdd16d4b9e91989aa1fce9a01030be4a42840 # Parent 1a077f01241b6256728751b00c552652d024c907 test-pushvars: invoke shell script hook via `sh` for Windows

D98: revset: support reading aliases from a .hgrevsets file

mharbison72 added a comment. In https://phab.mercurial-scm.org/D98#4834, @quark wrote: > It seems to me that a lot of security work (ex. knowing the "origin" when executing a revset, marking config items or sections as safe or unsafe by extensions) are required to be able to turn on

D342: rebase: change "result would have 3 parent" error message (BC)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG19f495fef0a3: rebase: change "result would have 3 parent" error message (BC) (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D342?vs=892=905

mercurial@33669: 2 new changesets (2 on stable)

2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/8de8f8a91f2d changeset: 33668:8de8f8a91f2d branch: stable parent: 33663:1814ca418b30 user:Kevin Bullock date:Thu Aug 10 21:25:02 2017 -0400

D359: pushvars: add a coreconfigitem for push.pushvars.server

lothiraldan accepted this revision. lothiraldan added a comment. LGTM REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D359 To: pulkit, #hg-reviewers, lothiraldan Cc: lothiraldan, mercurial-devel ___ Mercurial-devel

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

lothiraldan added a comment. Small nit-picking style comments on the doc-string. Also the message description must match contribution guidelines: https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist. This should be catched by the test `test-check-commit.t`. I

D381: simplemerge: stop accepting, and passing, file parameters

phillco 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/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py CHANGE

D380: simplemerge: stop reading from, and writing to, files

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now use contexts first for everything and also pass them everywhere. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D380 AFFECTED

D375: simplemerge: write merge result to the localctx, if passed

phillco 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/D375 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py

D378: contrib: make simplemerge script pass context-like objects

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `simplemerge()` will soon require context-like objects to work. Create a simple context-like object that wraps the requested files and can be passed to the new

D373: filemerge: pass contexts to simplemerge

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise, this should be a no-op. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D373 AFFECTED FILES mercurial/filemerge.py

D379: simplemerge: use context paths for default labels instead of file paths

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is the last place we used the filepath arguments without first using the context version. REPOSITORY rHG Mercurial REVISION DETAIL

D383: simplemerge: simplify code now that we always write to a context

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There's no need for an `out` abstraction between files and contexts anymore. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D383

D372: simplemerge: add optional context parameters to simplemerge

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename the existing parameters for clarity. These will, in subsequent patches, allow callers to redirect reads (of the three sides of the merge) and writes

D382: simplemerge: make context parameters non-optional

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also update the function docstring. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D382 AFFECTED FILES mercurial/simplemerge.py

Re: D242: context: rename troubled into isunstable

On Sun, 2017-08-13 at 05:01 +, yuja (Yuya Nishihara) wrote: > yuja added inline comments. > > INLINE COMMENTS > > > context.py:246 > > +self._repo.ui.deprecwarn(msg, '4.4') > > +return self.isunstable() > > + > > Please send a follow-up. This is too far from the tip to

D243: obsmarker: rename precnode into prednode

lothiraldan added inline comments. INLINE COMMENTS > yuja wrote in cmdutil.py:1916 > The template keyword should be updated as well. Please send a follow-up. I'm not sure to see which template keyword you are talking about. REPOSITORY rHG Mercurial REVISION DETAIL

D384: context: fix troubled deprecation

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY troubled has been renamed into isunstable but troubled was calling unstable instead. Fix the mistake. REPOSITORY rHG Mercurial REVISION DETAIL

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

martinvonz added inline comments. INLINE COMMENTS > quark wrote in rebase.py:1019 > I concluded that part of the reasons that the old code is messy is because it > uses too many `if`s and relies heavily on the fact that Mercurial has only 2 > parents. So I started with `for` as top-level block

D374: simplemerge: use contexts to read file data from, if passed

phillco 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/D374 AFFECTED FILES mercurial/simplemerge.py tests/test-lfconvert.t CHANGE DETAILS diff --git

D376: filemerge: extract `_picklabels` as a helper function

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This shortens `simplemerge()` and is a bit cleaner, IMO. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D376 AFFECTED FILES

D371: simplemerge: extract verifytext as a helper function

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will be used in a subsequent commit. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D371 AFFECTED FILES

D371: simplemerge: extract verifytext as a helper function

phillco added a comment. This stack isn't particular complicated; it's just that changing simplemerge to go from files to contexts, with small commits and working intermediate commits, requires some jumping around. REPOSITORY rHG Mercurial REVISION DETAIL

[PATCH] py3: change encoding.localstr to a subclass of bytes, not str

# HG changeset patch # User Yuya Nishihara # Date 1502693440 -32400 # Mon Aug 14 15:50:40 2017 +0900 # Node ID 3852cbe06ef50c23d5c6d25b4ad9b40885e47201 # Parent 8af5c6fc8ce4c53b43900c6bfb565daa285b8af1 py3: change encoding.localstr to a subclass of bytes, not str diff --git

[PATCH] cext: move PyInt macros to charencode.c properly

# HG changeset patch # User Yuya Nishihara # Date 1502685326 -32400 # Mon Aug 14 13:35:26 2017 +0900 # Node ID 9d9186f859585f2513e3bde3a304cc72cb534565 # Parent f7d6978a4da9deed920535630c32509683f29915 cext: move PyInt macros to charencode.c properly Python3 build was broken

[PATCH 1 of 2] bundle2: raise ProgrammingError for invalid call of addhookargs()

# HG changeset patch # User Yuya Nishihara # Date 1502589956 -32400 # Sun Aug 13 11:05:56 2017 +0900 # Node ID 1643bad8116707fb6e162a509682b470e9223fba # Parent 9d9186f859585f2513e3bde3a304cc72cb534565 bundle2: raise ProgrammingError for invalid call of addhookargs() It

[PATCH website] downloads: update latest python 2.6 compatible release

# HG changeset patch # User Boris Feld # Date 1502712731 -7200 # Mon Aug 14 14:12:11 2017 +0200 # Node ID ddff2dfaa572d7b5da7c412da521c793fe57518a # Parent a3901266377812a15c68295882030bb6f77bb338 downloads: update latest python 2.6 compatible release Replace link

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

quark updated this revision to Diff 869. quark marked 3 inline comments as done. This revision is now accepted and ready to land. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D21?vs=866=869 REVISION DETAIL https://phab.mercurial-scm.org/D21 AFFECTED

D340: rebase: prefer choosing merge base with successor in destination

quark updated this revision to Diff 870. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=868=870 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

quark added a comment. About the warning of unwanted changes, when thinking about it again, it seems sometimes people may want to do that kind of rebase. If we let them edit the merge result (ex. a merge conflict), than the workflow looks good - it's just the merge algorithm being

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

quark updated this revision to Diff 866. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D21?vs=829=866 REVISION DETAIL https://phab.mercurial-scm.org/D21 AFFECTED FILES hgext/rebase.py tests/test-rebase-brute-force.t

D340: rebase: prefer choosing merge base with successor in destination

quark updated this revision to Diff 868. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=830=868 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git

D385: drawdag: allow override file contents via comments

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes drawdag more flexible, and allow us to create non-clean merges in test cases. REPOSITORY rHG Mercurial REVISION DETAIL

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

quark planned changes to this revision. quark added a comment. I made some improvements on merge base handling. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D21 To: quark, durin42, #hg-reviewers Cc: martinvonz, durin42, mercurial-devel

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

martinvonz accepted this revision. martinvonz added a comment. Finally done reviewing this. Thanks for the rewrite! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D21 To: quark, durin42, #hg-reviewers, martinvonz Cc: martinvonz, durin42, mercurial-devel

D21: rebase: rewrite core algorithm (issue5578) (issue5630)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0975506120fb: rebase: rewrite core algorithm (issue5578) (issue5630) (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D21?vs=869=871 REVISION

[Bug 5657] New: converting repo with svn subrepo aborts

https://bz.mercurial-scm.org/show_bug.cgi?id=5657 Bug ID: 5657 Summary: converting repo with svn subrepo aborts Product: Mercurial Version: 4.2.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

D360: log: add a "graphwidth" template variable

hooper added a comment. In https://phab.mercurial-scm.org/D360#5639, @yuja wrote: > > The edge > > drawing function needs to know the number of lines in the template output, so > > we need to also determine how wide that drawing would be before we call the > > edgefn or

D385: drawdag: allow override file contents via comments

quark added inline comments. INLINE COMMENTS > martinvonz wrote in test-drawdag.t:243 > Does it support creating graphs of resolved conflicts as follows? > > > C # A/f = a > > |\ # B/f = b > > A B # C/f = c Yes. I uses `=` to indicate "replace the content". In the future

D385: drawdag: allow override file contents via comments

quark added a comment. Wait, I guess I know what you're saying. Let me double check. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D385 To: quark, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel