D5792: uncommit: added interactive mode(issue6062)

2019-02-15 Thread taapas1128 (Taapas Agrawal)
taapas1128 marked an inline comment as done. taapas1128 added a comment. @durin42 I have made the change. Please review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5792 To: taapas1128, #hg-reviewers, durin42 Cc: durin42, pulkit, lothiraldan, mercurial-devel

D5792: uncommit: added interactive mode(issue6062)

2019-02-15 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 14132. taapas1128 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5792?vs=13915&id=14132 REVISION DETAIL https://phab.mercurial-scm.org/D5792 AFFECTED FILES hgext/uncommit.py

D5945: rust: itering less on MissingAncestors.bases for max()

2019-02-15 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > ancestors.rs:347 > } > - > -let max_bases = > -bases_visit.iter().cloned().max().unwrap_or(NULL_REVISION); > -let max_revs = > -revs_visit.iter().cloned().max().unwrap_or(NULL_REVISION); > -

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14131. navaneeth.suresh marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5940?vs=14130&id=14131 REVISION DETAIL https://phab.mercurial-scm.org/D5940 AFFECTED FILES hgext/un

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh marked 4 inline comments as done. navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:140 > Nice point. I had to revisit the bug to understand more now. IMO the bug says > as following: > > `uncommit` should require a flag or config when it is

D5940: uncommit: make experimental.uncommitondirtydir to work on PATH (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14130. navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)" to "uncommit: make experimental.uncommitondirtydir to work on PATH (issu

D5782: changegroup: don't try to prune manifest nodes if not ellipses

2019-02-15 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5f9d057ba28c: changegroup: don't try to prune manifest nodes if not ellipses (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5

D5933: branchmap: improve doc about BranchMapCache class

2019-02-15 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa87ca1d7e61d: branchmap: improve doc about BranchMapCache class (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5933?vs=14023&

D5960: test: stabilize test-remotefilelog-bgprefetch.t flaky output

2019-02-15 Thread durin42 (Augie Fackler)
durin42 added a comment. Huh. That's strictly a bug, as `debugwaitonrepack` should actually be waiting. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5960 To: lothiraldan, #hg-reviewers Cc: durin42, mercurial-devel __

D5959: templates: adding a config() function for template customization

2019-02-15 Thread durin42 (Augie Fackler)
durin42 accepted this revision as: durin42. durin42 added a comment. I like this, but can see it being vaguely controversial so I'll only give it a +1 here for now - if I don't see objections in a few days I'll go ahead and land it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.

D5966: test: stabilize test-run-tests.t output

2019-02-15 Thread durin42 (Augie Fackler)
durin42 added inline comments. INLINE COMMENTS > test-run-tests.t:1177 >"test-failure.t": [\{] (re) > - "csys": "\s*[\d\.]{4,5}", ? (re) > - "cuser": "\s*[\d\.]{4,5}", ? (re) > + "csys": "\s*\d+\.\d{3,4}", ? (re) > + "cuser": "\s*\d+\.\d{3,4}", ? (re)

D5792: uncommit: added interactive mode(issue6062)

2019-02-15 Thread durin42 (Augie Fackler)
durin42 requested changes to this revision. durin42 added a comment. This revision now requires changes to proceed. I'd fix this one style nit in flight (this actually looks good), but it no longer applies - could you rebase it for me? INLINE COMMENTS > uncommit.py:321 > +return newnode

D5945: rust: itering less on MissingAncestors.bases for max()

2019-02-15 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9060af281be7: rust: itering less on MissingAncestors.bases for max() (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5945?vs

D5944: rust: stop putting NULL_REVISION in MissingAncestors.bases

2019-02-15 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG977432970080: rust: stop putting NULL_REVISION in MissingAncestors.bases (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D594

D5943: rust: less set lookups in MissingAncestors

2019-02-15 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfccb61a1777b: rust: less set lookups in MissingAncestors (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5943?vs=14040&id=14

D5942: rust: less set lookups in AncestorsIterator

2019-02-15 Thread gracinet (Georges Racinet)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG70827ebba453: rust: less set lookups in AncestorsIterator (authored by gracinet, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5942?vs=14039&id=1

D5968: obsutil: don't assume leftctx and rightctx repo as same

2019-02-15 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9de6c4f61608: obsutil: don't assume leftctx and rightctx repo as same (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5968?vs=

D5976: tests: add more wildcards to test-extdiff.t

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG88d4477ac4f6: tests: add more wildcards to test-extdiff.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5976?vs=14115&id=1

D5975: url: don't pass strict argument on Python 3

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG544035846830: url: don't pass strict argument on Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5975?vs=14114&id=1

D5952: url: always use str for proxy configuration

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG4028897dfa05: url: always use str for proxy configuration (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5952?vs=14113&id=1

D5974: tests: double escape \ in test-import-eol.t and test-mq-eol.t

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG140b542b0e59: tests: double escape \ in test-import-eol.t and test-mq-eol.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D5951: py3: port tinyproxy.py to work with Python 3

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG97e2442a4595: py3: port tinyproxy.py to work with Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5951?vs=14054&id=

D5950: url: always access req._tunnel_host

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd20f1594ff4a: url: always access req._tunnel_host (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5950?vs=14053&id=14118 RE

D5973: tests: use raw string in test-impexp-branch.t

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7396508ad92b: tests: use raw string in test-impexp-branch.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5973?vs=14111&id

D5976: tests: add more wildcards to test-extdiff.t

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The diff tool (which is `echo`) runs in the background and output order can therefore be non-deterministic. We need to glob over the file names to account for t

D5975: url: don't pass strict argument on Python 3

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The argument was removed in Python 3.4. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5975 AFFECTED FILES mercurial/ur

D5952: url: always use str for proxy configuration

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 14113. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5952?vs=14055&id=14113 REVISION DETAIL https://phab.mercurial-scm.org/D5952 AFFECTED FILES mercurial/url.py CHANGE DETAILS diff --git a/mercurial/url.py b/m

Re: email encoding help needed

2019-02-15 Thread Gregory Szorc
https://www.mercurial-scm.org/repo/hg/rev/9b3be572ff0c documented my findings when I looked at this a few days back. Something feels "off" with regards to our handling of encodings here. But I'm not sure exactly what we should change. On Fri, Feb 15, 2019 at 12:41 PM Augie Fackler wrote: > Howd

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in uncommit.py:87 > Hmm, "all files uncommitted, keeping empty commit" makes it sound like the > second part follows from the first (which is not correct). I'll just leave it > as is. And I just realized that we do use parent

D5974: tests: double escape \ in test-import-eol.t and test-mq-eol.t

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The shell eats the \\. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5974 AFFECTED FILES tests/test-import-eol.t tests/test-mq

D5973: tests: use raw string in test-impexp-branch.t

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On first glance, the escaping of \s seems correct. However, the shell eats the escape and we're left with '\s` in the written file. Let's use a raw string so we

D5934: phabricator: make user searches case-insensitive

2019-02-15 Thread jcristau (Julien Cristau)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG570e62f1dcf2: phabricator: make user searches case-insensitive (authored by jcristau, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5934?vs=14030

[PATCH 1 of 3] grep: give different labels to + and - symbols

2019-02-15 Thread Jordi Gutiérrez Hermoso
# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1550262244 18000 # Fri Feb 15 15:24:04 2019 -0500 # Node ID b5464436e4acdd1893ee86e5aa03f1d69ce4c4c5 # Parent a22321f2b1ee18ea09a70fee9e524d2f0298 grep: give different labels to + and - symbols I find it more useful to give diff

[PATCH 2 of 3] color: give colours to the grep.inserted and grep.deleted labels

2019-02-15 Thread Jordi Gutiérrez Hermoso
# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1550263402 18000 # Fri Feb 15 15:43:22 2019 -0500 # Node ID 9e2f595cf719f2dd863485067517f4f6c05dee73 # Parent b5464436e4acdd1893ee86e5aa03f1d69ce4c4c5 color: give colours to the grep.inserted and grep.deleted labels I find the "bold

[PATCH 3 of 3] color: change color of grep.rev label

2019-02-15 Thread Jordi Gutiérrez Hermoso
# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1550263757 18000 # Fri Feb 15 15:49:17 2019 -0500 # Node ID 07f0f1082c85076b6e0d0cb215fb34893170c11c # Parent 9e2f595cf719f2dd863485067517f4f6c05dee73 color: change color of grep.rev label GNU grep uses green for line numbers as we

email encoding help needed

2019-02-15 Thread Augie Fackler
Howdy folks! We're down to only a few (single digits!) failing tests on Python 3, but one in particular has us stuck: cd tests && python3 run-tests.py test-notify.t running 1 tests using 1 parallel processes --- tests/test-notify.t +++ /tests/test-notify.t.err @@ -415,36 +415,28 @@ > -m `"

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:87 > > I kind of like the all files uncommitted part since it explains what empty > > commit we're talking about. Should I add it back? > > sure! Hmm, "all files uncommitted, keeping empty commit" makes it sound li

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in uncommit.py:87 > I added a `note: ` in front instead. I think we usually use parentheses for > hints. > > I also changed s/preserving/keeping/ to match the term we use in the `--keep` > flag (and the upcoming config option). >

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:87 > how about something like this `(preserving the empty commit)`. The reason is > that we need to tell that the empty commit is preserved more than the fact > the commit is empty. > > note the `(`, it makes it lo

D5970: uncommit: add config option to keep commit by default

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 14109. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5970?vs=14102&id=14109 REVISION DETAIL https://phab.mercurial-scm.org/D5970 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS diff -

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 14108. martinvonz marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5969?vs=14101&id=14108 REVISION DETAIL https://phab.mercurial-scm.org/D5969 AFFECTED FILES hgext/uncommit.py

Re: caching pull - stable partitioning of bundle requests

2019-02-15 Thread Pulkit Goyal
On Thu, Oct 4, 2018 at 6:16 PM Boris FELD wrote: > The road for moving this in Core is clear, but not short. So far we have > not been able to free the necessary time to do it. Between the > paying-client work, we have to do to pay salaries (and keep users happy) > and all the time we are already

mercurial@41702: 19 new changesets

2019-02-15 Thread Mercurial Commits
19 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/a8d3a4be066e changeset: 41684:a8d3a4be066e user:Martin von Zweigbergk date:Mon Feb 11 09:12:23 2019 -0800 summary: windows: use util.localpath for repo-relative paths in getuipathfn() https://www.mer

[PATCH V2] templatekw: add a {negrev} keyword

2019-02-15 Thread Jordi Gutiérrez Hermoso
# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1550259811 18000 # Fri Feb 15 14:43:31 2019 -0500 # Node ID 2aa9472715119f26f2e688dd9130f717113ec518 # Parent a22321f2b1ee18ea09a70fee9e524d2f0298 templatekw: add a {negrev} keyword Revision numbers are getting much maligned for

[PATCH] chistedit: ensure a locale is set

2019-02-15 Thread Jordi Gutiérrez Hermoso
# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1550260567 18000 # Fri Feb 15 14:56:07 2019 -0500 # Node ID 611f94479e62c720f7f90f3a58137e97aa600fcb # Parent a22321f2b1ee18ea09a70fee9e524d2f0298 chistedit: ensure a locale is set My paternal surname was showing incorrectly wit

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > uncommit.py:87 > +if not files: > +repo.ui.status(_("all files uncommitted, the commit is now empty\n")) > + how about something like this `(preserving the empty commit)`. The reason is that we need to tell that the empty commit is pre

D5972: exchange: raise error.Abort instead of ValueError

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3b0ba4575c8c: exchange: raise error.Abort instead of ValueError (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5972?vs=1410

D5971: tests: remove -q from test-lfs-serve.t

2019-02-15 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG47c4ac5035a6: tests: remove -q from test-lfs-serve.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5971?vs=14104&id=14106

D5972: exchange: raise error.Abort instead of ValueError

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Raising ValueError results in an uncaught exception and a traceback being printed. In the context of servers, it can result in an HTTP 500 and an exception bein

D5971: tests: remove -q from test-lfs-serve.t

2019-02-15 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will make it easier to observe a behavior change in the next commit. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5971 AFF

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in uncommit.py:140 > Doesn't that mean the whole patch is unnecessary? It pretty much just > provides an easier way of saying `--config > experimental.uncommitondirtywdir=yes`, doesn't it? Nice point. I had to revisit the bug to

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in uncommit.py:140 > Doesn't that mean the whole patch is unnecessary? It pretty much just > provides an easier way of saying `--config > experimental.uncommitondirtywdir=yes`, doesn't it? I tried with `--allow-dirty-wo

D5968: obsutil: don't assume leftctx and rightctx repo as same

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 14103. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5968?vs=14099&id=14103 REVISION DETAIL https://phab.mercurial-scm.org/D5968 AFFECTED FILES mercurial/obsutil.py CHANGE DETAILS diff --git a/mercurial/obsutil.

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in uncommit.py:140 > we have a config for that already, let's prevent to introduce flags for > config options and vice versa here. Doesn't that mean the whole patch is unnecessary? It pretty much just provides an easier way of sa

D5792: uncommit: added interactive mode(issue6062)

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D5792#87115, @taapas1128 wrote: > @pulkit I have updated the description . Great thanks! As mentioned before I will let someone else review this :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.or

D5970: uncommit: add config option to keep commit by default

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have a Google-internal extension that keeps track of "review units" (like Phabricator reviews, or Gerrit's Change-Id). This information is stored outside o

D5969: uncommit: inform user if the commit is empty after uncommit

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz 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/D5969 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS diff --git a/tests/te

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in uncommit.py:140 > Could you rename --force to e.g. --allow-dirty-working-copy so it's clearer > what's being allowed? we have a config for that already, let's prevent to introduce flags for config options and vice versa here.

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Your current patch is doing more than one thing. Let's split this up and make one patch do one thing. INLINE COMMENTS > uncommit.py:168 > > +if old.p2(): > +raise error.Abort(_("outstanding uncommitted merge")) this merits a different patch and

D5940: uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh updated this revision to Diff 14100. navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "uncommit: add -f/--force when possibly hiding data (issue5977)" to "uncommit: add --allowdirtywcopy when possibly hiding data (issue5977)". RE

D5940: uncommit: add -f/--force when possibly hiding data (issue5977)

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > uncommit.py:140 > [('', 'keep', False, _('allow an empty commit after uncommiting')), > + ('f', 'force', False, _('allow uncommit with outstanding changes')), > ] + commands.walkopts, Could you rename --force to e.g. --allow-dirty

D5940: uncommit: add -f/--force when possibly hiding data (issue5977)

2019-02-15 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh added inline comments. INLINE COMMENTS > martinvonz wrote in test-uncommit.t:176-179 > Why did this change? > > I don't understand what the new flag is for since we already how the config > option. They seem to me to do the same thing. I'm also surprised at the change in that

D5968: obsutil: don't assume leftctx and rightctx repo as same

2019-02-15 Thread lothiraldan (Boris Feld)
lothiraldan accepted this revision. lothiraldan added a comment. LGTM, nice catch! Could you add a comment to clarify it? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5968 To: pulkit, #hg-reviewers, lothiraldan Cc: lothiraldan, mercurial-devel

D5940: uncommit: add -f/--force when possibly hiding data (issue5977)

2019-02-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > test-uncommit.t:176-179 >$ hg uncommit --config experimental.uncommitondirtywdir=True > + abort: uncommitted changes > + (use -f to force) > + [255] Why did this change? I don't understand what the new flag is for since we already how t

D5792: uncommit: added interactive mode(issue6062)

2019-02-15 Thread taapas1128 (Taapas Agrawal)
taapas1128 added a comment. @pulkit I have updated the description . REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5792 To: taapas1128, #hg-reviewers Cc: pulkit, lothiraldan, mercurial-devel ___ Mercurial-devel mailin

[PATCH RFC] cmdtest: add a new command that checks revset matching

2019-02-15 Thread Raphaël Gomès
# HG changeset patch # User Raphaël Gomès # Date 1550068454 -3600 # Wed Feb 13 15:34:14 2019 +0100 # Node ID f850e5c8547df95cd4bcb38b4ade5b5af955 # Parent 91701785c2c56a3ee395038488758ad2e1865265 # EXP-Topic cmd-test cmdtest: add a new command that checks revset matching This command is

D5968: obsutil: don't assume leftctx and rightctx repo as same

2019-02-15 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Backed out changeset https://phab.mercurial-scm.org/rHG520514af2d9378d9d5815f0c4edc01617968356d. hgsubversion can pass leftctx and rightctx which are instances