D930: merge: add tests to show current behavior on failed filemerges

quark added inline comments. INLINE COMMENTS > test-merge-halt.t:32 > + [1] > + > + $ hg rebase --abort Should we have an `hg resolve -l` here? > test-merge-halt.t:36 > + > +Halting works on first failure > + $ echo onfailure=halt >> $HGRCPATH It feels a bit strange that the text says

D817: histedit: add move histedit action

quark added a comment. In https://phab.mercurial-scm.org/D817#15385, @mbthomas wrote: > I'm thinking now that maybe we don't want `move` at all. If someone does want to move a commit using histedit, they can `copy` it in and then strip/hide the old commit. At the moment there is no

D975: test-rebase-base: clarify it is about the "--base" flag

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It happened several times that people use `test-rebase-base.t` as a general purposed test file for rebase. But it is intended to be only related to the `--base`

mercurial@34486: 6 new changesets (1 on stable)

6 new changesets (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/bb14dbab4df6 changeset: 34481:bb14dbab4df6 branch: stable parent: 34356:c74d6d870073 user:Augie Fackler date:Wed Oct 04 09:04:52 2017 -0400 summary: tests:

D966: hgweb: produce native string for etag value

quark added inline comments. INLINE COMMENTS > common.py:211 > def caching(web, req): > -tag = 'W/"%s"' % web.mtime > +tag = r'W/"%d"' % web.mtime > if req.env.get('HTTP_IF_NONE_MATCH') == tag: It seems we are depending on `os.stat_float_times(False)`. But that is deprecated in

D972: py3: fix keyword arguments handling in mq

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch fixes the handling of keyword arguments to functions on Python 3. On python3, the keys of keyword arguments need to str which is unicode. So any

D974: py3: handle keyword arguments correctly in hgext/patchbomb.py

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The keys of keyword arguments must be str on Python 3 which is unicode. This patch make sure we pass keyword arguments with keys are str everywhere in this file

D965: templatefilters: be sure we always feed cgi.escape a str

pulkit accepted this revision. pulkit added a comment. Checked docs and made sure `cgi.escape` on Python 3 accepts str only. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D965 To: durin42, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel

D821: unamend: move fb extension unamend to core

pulkit updated this revision to Diff 2493. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D821?vs=2128=2493 REVISION DETAIL https://phab.mercurial-scm.org/D821 AFFECTED FILES hgext/uncommit.py tests/test-unamend.t CHANGE DETAILS diff --git

D971: uncommit: unify functions _uncommitdirstate and _unamenddirstate to one

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The _unamenddirstate() function was inspired by _uncommitdirstate() function as the logic was same but we were unable to use the latter function directly. So

[Bug 5700] New: hg unshelve not allowed while mid-histedit

https://bz.mercurial-scm.org/show_bug.cgi?id=5700 Bug ID: 5700 Summary: hg unshelve not allowed while mid-histedit Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED

D943: chg: move only first time relevant if condition out of loop

singhsrb added a comment. In my opinion, just checking for `hg -R ... serve` would not solve the problem. If we go through that route, we would probably want to always detect the serve command rather than mostly detecting the serve command. However, if we do go in that direction and it

D942: histedit: removing the experimental config 'histeditng'

This revision was automatically updated to reflect the committed changes. Closed by commit rHG270e344a6c74: histedit: removing the experimental config histeditng (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D958: i18n: clean msgcache when encoding changes

quark updated this revision to Diff 2490. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D958?vs=2473=2490 REVISION DETAIL https://phab.mercurial-scm.org/D958 AFFECTED FILES mercurial/dispatch.py

D959: patch: invalidate messages after encoding change

quark updated this revision to Diff 2491. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D959?vs=2474=2491 REVISION DETAIL https://phab.mercurial-scm.org/D959 AFFECTED FILES mercurial/patch.py CHANGE DETAILS

D942: histedit: removing the experimental config 'histeditng'

singhsrb updated this revision to Diff 2489. singhsrb edited the test plan for this revision. singhsrb added a comment. Updating https://phab.mercurial-scm.org/D942: Modified test plan to account for documentation. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D942: histedit: removing the experimental config 'histeditng'

singhsrb updated this revision to Diff 2488. singhsrb added a comment. Updating https://phab.mercurial-scm.org/D942: Addressing the review comments and adding some documentation. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D942?vs=2440=2488 BRANCH

D936: convert: fix the RevisionSpec import in the bzr module

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6bda8a9d8431: convert: fix the RevisionSpec import in the bzr module (authored by singhsrb, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D963: hgweb: in protocol adapter, look for bytes instances, not str

durin42 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/D963 AFFECTED FILES mercurial/hgweb/protocol.py CHANGE DETAILS diff --git

D966: hgweb: produce native string for etag value

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also use %d since we know mtime is numeric. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D966 AFFECTED FILES

D967: hgweb: when constructing or adding to a wsgi environ dict, use native strs

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY That's what's required of us to work with the WSGI API on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D967 AFFECTED

D969: request: coerce content-type to native str

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Again, required by WSGI. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D969 AFFECTED FILES mercurial/hgweb/request.py CHANGE

D942: histedit: removing the experimental config 'histeditng'

singhsrb added a comment. I totally missed the decorator. Thanks guys! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D942 To: singhsrb, #hg-reviewers, quark, durin42 Cc: durin42, quark, mercurial-devel ___

D970: hgweb: extract function for loading style from request context

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also make it work on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D970 AFFECTED FILES mercurial/hgweb/hgweb_mod.py

D964: python3: add and use adapter for func_name attr, now known as __name__

durin42 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/D964 AFFECTED FILES mercurial/peer.py mercurial/pycompat.py mercurial/templater.py CHANGE DETAILS

D968: request: use trivial iterator over dictionary keys

durin42 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/D968 AFFECTED FILES mercurial/hgweb/request.py CHANGE DETAILS diff --git a/mercurial/hgweb/request.py

D965: templatefilters: be sure we always feed cgi.escape a str

durin42 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/D965 AFFECTED FILES mercurial/templatefilters.py CHANGE DETAILS diff --git

D962: hgweb: in protocol adapter, avoid control reaching end of non-void function

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This greatly confounded some Python 3 porting work, once it was managing to get this far. REPOSITORY rHG Mercurial REVISION DETAIL

D961: test-check-code: fail new commits which use 'atexit' instead of 'ui.atexit'

singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Callbacks registered with 'atexit' are sometimes not called (like when hg aborts and calls os._exit). On the other hand, callbacks registered with 'ui.atexit'

D960: bundle2: immediate exit for ctrl+c (issue5692)

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/rHG21c2df59a1dad534bfac45acc0bbfb6cb2afe9b4 regressed bundle2 by catching all exceptions and trying to handle them. The old

D957: test-push-race: use 'ui.atexit' instead of python's 'atexit'

singhsrb updated this revision to Diff 2475. singhsrb edited the summary of this revision. singhsrb added a comment. Updating to a more correct summary. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D957?vs=2472=2475 BRANCH default REVISION DETAIL

D958: i18n: clean msgcache when encoding changes

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In rare cases (ex. chg), encoding may change on the fly and existing i18n msgcache needs to be cleared. This reveals an issue of test-commit-interactive.t,

D959: patch: invalidate messages after encoding change

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously the code caches i18n._ results in module variables. That should be invalidated with encoding change. This makes test-commit-interactive.t work as

D957: test-push-race: use 'ui.atexit' instead of python's 'atexit'.

singhsrb updated this revision to Diff 2472. singhsrb added a comment. Removing the full-stop at the end of commit message. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D957?vs=2471=2472 BRANCH default REVISION DETAIL

D957: test-push-race: use 'ui.atexit' instead of python's 'atexit'.

singhsrb created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 'atexit' is sometimes not called (like when a process is killed by the SIGTERM signal). Therefore, this commit replaces it with 'ui.atexit' which is always

Re: rfc for a change in an error message (cross branch dirty update)

Thanks Denis, I see I was late to the party. Maybe, once "experimental.updatecheck=noconflict" stabilizes, we could suggest "--merge" only if it is not going to cause a conflict. On 10/05/2017 09:39 AM, Denis Laxalde wrote: muxator via Mercurial-devel a écrit : # HG changeset patch #

D956: test-annotate: fix up expected output for pure

This revision was automatically updated to reflect the committed changes. Closed by commit rHG323bed58cf57: test-annotate: fix up expected output for pure (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D956: test-annotate: fix up expected output for pure

krbullock added a comment. Sure, queued. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D956 To: durin42, #hg-reviewers Cc: krbullock, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D943: chg: move only first time relevant if condition out of loop

quark added a comment. I think the general rule of extracting one-time condition to outside a loop is correct. But the `i == 0` check may be subject to change - if we do want to support `hg -R ... serve` for example, `i == 0` may be changed to `iscmdname` or something. And this diff would

D956: test-annotate: fix up expected output for pure

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is just a side effect of surfacing the "revisions were skipped" state in the blame output. REPOSITORY rHG Mercurial REVISION DETAIL

D943: chg: move only first time relevant if condition out of loop

singhsrb added a comment. Just to be clear: this change was also for readability apart from performance improvement. I personally prefer conditional code inside the loops to not keep checking if its the first or last iteration because then one can say that `the loop checks for conditions

D934: rebase: add an experimental.showhashchanges config to show hash changes

quark added a comment. I'm trying to write a version that decouples the rendering logic from the data. But it's trickier than I thought (ex. issue5699). I guess some refactoring needs to be done. Meanwhile I think it would be good enough if you can avoid passing `fm` around. INLINE

D943: chg: move only first time relevant if condition out of loop

singhsrb updated this revision to Diff 2468. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D943?vs=2441=2468 REVISION DETAIL https://phab.mercurial-scm.org/D943 AFFECTED FILES contrib/chg/chg.c CHANGE DETAILS diff --git a/contrib/chg/chg.c

Welcome new reviewers!

At the 4.4 sprint, the steering committee extended the following offers of reviewer status, which were accepted: Anton Shestakov > has reviewer access for hgweb Ryan McElroy > has general reviewer access Also, we've

D934: rebase: add an experimental.showhashchanges config to show hash changes

durin42 added a comment. In https://phab.mercurial-scm.org/D934#15995, @pulkit wrote: > In https://phab.mercurial-scm.org/D934#15939, @durin42 wrote: > > > I see what it does, but why? What's the motivation for the feature? > > > It's for automation and helping editors such as

D934: rebase: add an experimental.showhashchanges config to show hash changes

pulkit added a comment. In https://phab.mercurial-scm.org/D934#15939, @durin42 wrote: > I see what it does, but why? What's the motivation for the feature? It's for automation and helping editors such as Nuclide. REPOSITORY rHG Mercurial REVISION DETAIL

D955: merge: improve comments in mergestate._makerecords

ryanmce accepted this revision. ryanmce added a comment. so good! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D955 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list

D861: commands: tidy up merge state decoding in resolve

ryanmce accepted this revision. ryanmce added a comment. nice! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D861 To: mbthomas, #hg-reviewers, dlax, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing

D787: tests: add test for path conflicts during merge

ryanmce accepted this revision. ryanmce added a comment. lgtmacro REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D787 To: mbthomas, #hg-reviewers, swhitaker, ryanmce Cc: ryanmce, swhitaker, mercurial-devel ___

D785: context: also consider path conflicts when clearing unknown files

ryanmce accepted this revision. ryanmce added a comment. Updated version looks good to me REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D785 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, kiilerix, mercurial-devel

D784: merge: check for path conflicts when merging (issue5628)

ryanmce added inline comments. INLINE COMMENTS > merge.py:927 > +if p not in deletedfiles: > +ctxname = str(wctx).rstrip('+') > +pnew = util.safename(p, ctxname, wctx, set(actions.keys())) nit: worth a comment as to why we strip the + REPOSITORY rHG Mercurial

D785: context: also consider path conflicts when clearing unknown files

mbthomas marked 2 inline comments as done. mbthomas added inline comments. INLINE COMMENTS > mbthomas wrote in test-pathconflicts-basic.t:38 > I will strip the `+` characters. I didn't know these caused problems on > Windows. Now stripping '+' symbols in https://phab.mercurial-scm.org/D784.

D784: merge: check for path conflicts when merging (issue5628)

ryanmce accepted this revision. ryanmce added a comment. I'm so excited by these improvements. one nit inline but this is such an improvement! INLINE COMMENTS > mbthomas wrote in merge.py:903-921 > This is potentially slow for large repos, as it has to iterate over the whole >

D782: merge: improve error messages for path conflicts during update

ryanmce accepted this revision. ryanmce added a comment. still looks good after updates REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D782 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___

D779: merge: add _checkunknowndirs function for detecting path conflicts

ryanmce accepted this revision. ryanmce added a comment. Would love to see the comment added, but the code looks good to me. INLINE COMMENTS > mbthomas wrote in merge.py:654 > As in `_checkunknownfile`, this is to avoid symlink traversal while checking > these files. > > Consider: > > $

D781: merge: check for path conflicts when updating (issue5628)

ryanmce accepted this revision. ryanmce added a comment. Still looks good. The test looks much better now! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D781 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

D780: merge: rename conflicts to fileconflicts in _checkunknownfiles

ryanmce accepted this revision. ryanmce added a comment. still lookin good here REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D780 To: mbthomas, #hg-reviewers, ryanmce Cc: mercurial-devel ___ Mercurial-devel mailing

D778: merge: backup conflicting directories when getting files

ryanmce accepted this revision. ryanmce added a comment. lgtm INLINE COMMENTS > kiilerix wrote in merge.py:1175 > This seems quite a bit slower. But I guess it never will happen in tight > loops? If we have to backup a lot of files, then we have lost anyway? > If we have to backup a lot

D777: merge: add merge action 'pr' to rename files during update

ryanmce accepted this revision. ryanmce added a comment. lgtm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D777 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list

mercurial@34480: 16 new changesets

16 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/80d4681150b9 changeset: 34465:80d4681150b9 user:Augie Fackler date:Sun Oct 01 10:45:03 2017 -0400 summary: urllibcompat: new library to help abstract out some python3 urllib2 stuff

D777: merge: add merge action 'pr' to rename files during update

mbthomas added inline comments. INLINE COMMENTS > mbthomas wrote in merge.py:1461 > I had tested transitive renames after update, but not before. I'll fix it up > and add a test. Test added as `Update - local renamed file conflicts with remote directory` in

Re: [PATCH 2 of 4] diff: pass down line range information from changeset_printer to patch.diff()

On Wed, 04 Oct 2017 17:04:00 +0200, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1507127862 -7200 > # Wed Oct 04 16:37:42 2017 +0200 > # Node ID f7b31d85dc0e7c7e60b85d0a7fd728a32ba210ea > # Parent

Re: [PATCH 4 of 4] log: add -L/--line-range option to follow file history by line range

On Wed, 04 Oct 2017 17:04:02 +0200, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1507127733 -7200 > # Wed Oct 04 16:35:33 2017 +0200 > # Node ID 0f2d8b304223a8d00163f917fdc18082a88bceae > # Parent

D934: rebase: add an experimental.showhashchanges config to show hash changes

durin42 added a comment. I see what it does, but why? What's the motivation for the feature? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D934 To: pulkit, #hg-reviewers Cc: durin42, mercurial-devel ___

D872: releasenotes: add test showing TypeError with no file specified

durin42 abandoned this revision. durin42 added a comment. was folded into https://phab.mercurial-scm.org/D877 and landed REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D872 To: durin42, #hg-reviewers, pulkit, yuja, rishabhmadan96 Cc: yuja, mercurial-devel

D955: merge: improve comments in mergestate._makerecords

mbthomas 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/D955 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D942: histedit: removing the experimental config 'histeditng'

durin42 requested changes to this revision. durin42 added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > quark wrote in histedit.py:796 > You can use the decorator here: > > @action() > > just like line 819. Please do this, then I think you're good to

D776: merge: add merge action 'p' to record path conflicts during update

ryanmce accepted this revision. ryanmce added a comment. lgtm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D776 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list

D774: merge: add pathconflict merge state

ryanmce accepted this revision. ryanmce added a comment. lgtm INLINE COMMENTS > mbthomas wrote in merge.py:364-365 > This could use some improvement in general, so I'll write some comments on > how this function works as a follow-up patch. that works for me > mbthomas wrote in

D774: merge: add pathconflict merge state

mbthomas added inline comments. INLINE COMMENTS > ryanmce wrote in merge.py:364-365 > Even though there's not a lot of good comments here, now, could you add some > when you modify this? > > Something like "if the state includes a path conflict (pu or pr), include a > Path (P) record which

mercurial@34464: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/8337f7772aa2 changeset: 34462:8337f7772aa2 user:Gregory Szorc date:Sun Oct 01 23:47:16 2017 +0100 summary: fsmonitor: access copymap in new location

D886: ui: convert to/from Optional[bytes] to Optional[str] in password manager

This revision was automatically updated to reflect the committed changes. Closed by commit rHG75de5d456b60: ui: convert to/from Optional[bytes] to Optional[str] in password manager (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D912: test-alias: make it compatible with chg

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa8a9c0d3232b: test-alias: make it compatible with chg (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D912?vs=2452=2462

D917: eol: make [eol] config section sensitive for chg confighash

This revision was automatically updated to reflect the committed changes. Closed by commit rHG37b7581e5737: eol: make [eol] config section sensitive for chg confighash (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D946: serve: make tests compatible with chg

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa6d95a8b7243: serve: make tests compatible with chg (authored by singhsrb, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D946?vs=2447=2460#toc REPOSITORY rHG Mercurial

D943: chg: move only first time relevant if condition out of loop

yuja added subscribers: quark, yuja. yuja requested changes to this revision. yuja added a comment. This revision now requires changes to proceed. I prefer the original code since it looks simpler and there wouldn't be measurable performance win. @quark which do you like? INLINE

D954: style: never use a space before a colon or comma

alex_gaynor created this revision. alex_gaynor added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH style-fixes (bookmark) on default (branch) REVISION DETAIL https://phab.mercurial-scm.org/D954

D680: scmutil: handle conflicting files and dirs in origbackuppath

ryanmce accepted this revision. ryanmce added a comment. It looks like all concerns have been addressed. This looks good to me. INLINE COMMENTS > mbthomas wrote in scmutil.py:570 > At this point the path is a vfs-path within the repo, so it should be using > `/` as a separator. > > In the

D886: ui: convert to/from Optional[bytes] to Optional[str] in password manager

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

Re: [PATCH 7 of 7] extdata: abort if external command exits with non-zero status

On Wed, 04 Oct 2017 18:25:41 +0100, FUJIWARA Katsunori wrote: > At Tue, 3 Oct 2017 22:22:52 +0900, > Yuya Nishihara wrote: > > > > On Sun, 01 Oct 2017 17:15:06 +0100, FUJIWARA Katsunori wrote: > > > At Sun, 01 Oct 2017 13:00:18 +0100, > > > Yuya Nishihara wrote: > > > > > > > > # HG changeset

Re: [PATCH 1 of 6] configitems: register the 'histedit.defaultrev' config

On Wed, 04 Oct 2017 15:54:06 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498786957 -7200 > # Fri Jun 30 03:42:37 2017 +0200 > # Node ID a1d86c040bd28d7f96e107d55e7a0cdda2bd63ec > # Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e > #

Re: [PATCH 1 of 2] configitems: register the 'transplant.filter' config

On Wed, 04 Oct 2017 15:43:20 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1498787069 -7200 > # Fri Jun 30 03:44:29 2017 +0200 > # Node ID 3d3e64d40c3a32fc7ada6c00ee56da35bf992651 > # Parent 2fd06499dc8e6a5a784b1334b925c289d7b54e4e > #

Re: [PATCH stable] tests: invoke run-tests.py in test-hghave using $PYTHON (issue5697)

On Wed, 04 Oct 2017 09:04:59 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1507122292 14400 > # Wed Oct 04 09:04:52 2017 -0400 > # Branch stable > # Node ID bb14dbab4df63306e702b9b26d0e2377bce82bb2 > # Parent

D937: remotenames: move function to pull remotenames from the remoterepo to core

pulkit added a comment. In https://phab.mercurial-scm.org/D937#15824, @dlax wrote: > Also, it'd be useful to indicate where the code comes from (i.e. what is the "remoterepo" mentioned in the first line of the commit message). Yeah sure I will add that in next version. >

D933: scmutil: add a new function to show changes after a command

dlax accepted this revision. dlax added a comment. This patch looks good to me. But I have no idea if the overall idea in the series is good or not. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D933 To: pulkit, #hg-reviewers, dlax Cc: dlax, quark, yuja,

D933: scmutil: add a new function to show changes after a command

pulkit updated this revision to Diff 2458. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D933?vs=2427=2458 REVISION DETAIL https://phab.mercurial-scm.org/D933 AFFECTED FILES mercurial/scmutil.py CHANGE DETAILS diff --git a/mercurial/scmutil.py

D932: filemerge: introduce functions to halt merge flow

ryanmce added a comment. > I was initially confused by the description of this change, because the user can already halt (by configuration) after the first failed file merge. As far as I know, this is simply not true. I know of no way in mercurial, before this series, to halt a merge

D930: merge: add tests to show current behavior on failed filemerges

ryanmce added inline comments. INLINE COMMENTS > krbullock wrote in test-merge-halt.t:24 > Why test this with rebase instead of merge? That's how I roll. That being said, I'm happy to change it if people feel testing merge would provide more value. REPOSITORY rHG Mercurial REVISION DETAIL

D953: merge: use filemerge failure handler in post-filemerge checks checks

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D952. This allows the user to halt the merge if conflict markers or no changes are found in the merged file as

D952: merge: additional test cases to show changing behavior

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D951. In the next patch more cases of failed file merges will be able to halt the merge process. Add some test

D951: merge: allow user to halt merge on merge-tool failures

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D932. Call the new _onfilemergefailure function when a merge tool reports failure via a return code. REPOSITORY

D940: remotenames: add functions to read remotenames data from .hg/remotenames/

dlax requested changes to this revision. dlax added a comment. This revision now requires changes to proceed. Overall, the series only introduces helper functions. So it's hard to tell if the implementation is meaningful without any use of the code... INLINE COMMENTS > remotenames.py:31 >

D939: remotenames: add functionality to store remotenames under .hg/hgremotenames/

dlax requested changes to this revision. dlax added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > remotenames.py:31 > > +def saveremotebookmarks(repo, vfs, remotepath, bookmarks): > +""" save remote bookmarks in .hg/remotenames/bookmarks. `repo`

D937: remotenames: move function to pull remotenames from the remoterepo to core

dlax added a comment. Also, it'd be useful to indicate where the code comes from (i.e. what is the "remoterepo" mentioned in the first line of the commit message). Then, a module docstring explaining the concept at stake (starting by what is a "remotename") and the purpose of the

Re: rfc for a change in an error message (cross branch dirty update)

muxator via Mercurial-devel a écrit : # HG changeset patch # User muxator # Date 1507151594 -7200 #  Wed Oct 04 23:13:14 2017 +0200 # Node ID fb134b55bce708f567cb4f32c0d96bb032c2651c # Parent  c67db5dc131d0facdfdadc8c3344a8f3e689867d ux: propose "hg update --merge" in the

D948: run-tests: extract Popen logic to a single method

dlax added inline comments. INLINE COMMENTS > run-tests.py:2116 > +pread(bisectcmd + ['--good', >self._runner.options.known_good_rev]) > # TODO: we probably need to forward more options Perhaps also update the indentation of continuation line?

D937: remotenames: move function to pull remotenames from the remoterepo to core

dlax requested changes to this revision. dlax added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > remotenames.py:28 > +if node in repo and not repo[node].obsolete(): > +bmap[branch].append(node) I don't get the point of the