martinvonz added a comment.
In https://phab.mercurial-scm.org/D3660#57581, @yuja wrote:
> >> commands.py:67
> > > dateutil,
> > > procutil,
> > > stringutil,
> >
> > test-check-pyflakes.t complains about this no longer being used. I'll
remove it in flight.
yuja added a comment.
>> commands.py:67
> > dateutil,
> > procutil,
> > stringutil,
>
> test-check-pyflakes.t complains about this no longer being used. I'll
remove it in flight.
I've pushed the fixed version.
REPOSITORY
rHG Mercurial
REVISION DETAIL
> > commands.py:67
> > dateutil,
> > procutil,
> > stringutil,
>
> test-check-pyflakes.t complains about this no longer being used. I'll remove
> it in flight.
I've pushed the fixed version.
___
Mercurial-devel mailing list
martinvonz added inline comments.
INLINE COMMENTS
> commands.py:67
> dateutil,
> procutil,
> stringutil,
test-check-pyflakes.t complains about this no longer being used. I'll remove it
in flight.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3660
On Thu, May 24, 2018 at 6:57 AM Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1525340282 -32400
> # Thu May 03 18:38:02 2018 +0900
> # Node ID a9b271c7d3c095c381da92be0ad7bfd2e9555ac9
> # Parent
On Thu, May 24, 2018 at 6:45 AM Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1527166471 -32400
> # Thu May 24 21:54:31 2018 +0900
> # Branch stable
> # Node ID a3b4ccbec269a4ffabdcc681212a36bbbdc4cca8
> # Parent
# HG changeset patch
# User Yuya Nishihara
# Date 1527305887 -32400
# Sat May 26 12:38:07 2018 +0900
# Node ID edb77549a0ac6a6d6f3c53ead56738ca7f0dabce
# Parent 7fb141e660f0e83b98388f1fdaf3480b548b2ce8
py3: wrap tempfile.NamedTemporaryFile() to return bytes fp.name
Unlike
# HG changeset patch
# User Yuya Nishihara
# Date 152730 -32400
# Sat May 26 12:14:04 2018 +0900
# Node ID 15be905498df86a8ff372e822a22262289f115da
# Parent aa10675c5dd6769511e7b3ffb95279057ea4c2dd
py3: wrap tempfile.mkstemp() to use bytes path
This patch just flips the
# HG changeset patch
# User Yuya Nishihara
# Date 1527304836 -32400
# Sat May 26 12:20:36 2018 +0900
# Node ID 7fb141e660f0e83b98388f1fdaf3480b548b2ce8
# Parent 15be905498df86a8ff372e822a22262289f115da
py3: wrap tempfile.mkdtemp() to use bytes path
This also flips the
On Fri, 25 May 2018 23:21:09 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1524798019 14400
> # Thu Apr 26 23:00:19 2018 -0400
> # Node ID f900dd997ad3118d808891ebd746983255890135
> # Parent
# HG changeset patch
# User Matt Harbison
# Date 1524798019 14400
# Thu Apr 26 23:00:19 2018 -0400
# Node ID f900dd997ad3118d808891ebd746983255890135
# Parent 2ce1e9bdc7157948fa799888009cc4c20c113d8c
lfs: clarify pointer validation error messages
It wasn't obvious
# HG changeset patch
# User Yuya Nishihara
# Date 1527301982 -32400
# Sat May 26 11:33:02 2018 +0900
# Node ID b986ca72fc0f22ec4e04cff722eb9efa2a61dff5
# Parent 31143eaaf90624060f7bd894421daafa5226605c
revlog: disallow setting uncompressed length to None
Backed out changeset
# HG changeset patch
# User Yuya Nishihara
# Date 1527301911 -32400
# Sat May 26 11:31:51 2018 +0900
# Node ID 31143eaaf90624060f7bd894421daafa5226605c
# Parent 2ce1e9bdc7157948fa799888009cc4c20c113d8c
unionrepo: fill in uncompressed length of revlog entry
It can be either
On Fri, 25 May 2018 18:31:03 -0400, Matt Harbison wrote:
> On Fri, 25 May 2018 08:24:01 -0400, Yuya Nishihara wrote:
> > On Tue, 22 May 2018 23:43:24 -0400, Matt Harbison wrote:
> >> # HG changeset patch
> >> # User Matt Harbison
> >> # Date 1527045735
On Thu, 24 May 2018 16:35:31 -0400, Hollis Blanchard
wrote:
On 05/24/2018 11:38 AM, Augie Fackler wrote:
On May 24, 2018, at 2:20 PM, Hollis Blanchard
>
wrote:
On 05/23/2018 03:15 PM, Hollis
2 new changesets (2 on stable) in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/8c828beb7543
changeset: 38038:8c828beb7543
branch: stable
user:Yuya Nishihara
date:Fri May 18 21:24:06 2018 +0900
summary: lock: add internal config to not replace
https://bz.mercurial-scm.org/show_bug.cgi?id=5897
Bug ID: 5897
Summary: `hg next --evolve` is not abortable (exception:
KeyError: 'startnode')
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
On Fri, 25 May 2018 08:24:01 -0400, Yuya Nishihara wrote:
On Tue, 22 May 2018 23:43:24 -0400, Matt Harbison wrote:
# HG changeset patch
# User Matt Harbison
# Date 1527045735 14400
# Tue May 22 23:22:15 2018 -0400
# Node ID
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch starts storing the value of --edit flag passed by the user
initially
when they runs `hg graft --edit`. We can now read the value from graftstate in
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Right now, if you run `hg graft --edit`, face some conflicts, resolve them and
then run `hg graft --continue`, you will see graft no longer pops up for the
https://bz.mercurial-scm.org/show_bug.cgi?id=5896
Bug ID: 5896
Summary: narrow doesn't play well with share
Product: Mercurial
Version: 4.6rc0
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We now stores the value of --log flag passed initially in the graftstate and
reuse that value when doing `hg graft --continue` which is a nice behavior.
The
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch shows that when we do `hg graft --continue`, the value of --log
flag
passed when initial graft was run was not used.
Next patch will fix this and
https://bz.mercurial-scm.org/show_bug.cgi?id=5895
Bug ID: 5895
Summary: Catch and explain the sudo case
Product: Mercurial
Version: 4.6
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdecdb587ea12: graft: reuse --user and --date values in `hg
graft --continue` (BC) (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG108ebd8eff5c: tests: add test showing --continue not
preserving --date and --user flags (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd9572d344e59: graft: drop --user and --date values info
from hint in case of conflicts (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG63553c2bef7e: graft: store user passed date and user
information in graftstate (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
pulkit added a comment.
In https://phab.mercurial-scm.org/D3657#57527, @indygreg wrote:
> I'm assuming we don't need to bump the state version since the new state
file format is still relatively new. But if we had shipped the new state file
in a release, I would insist on bumping the
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.
I'm assuming we don't need to bump the state version since the new state file
format is still relatively new. But if we had shipped the new state file in a
release, I would insist on
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0dfa27e53c57: graft: use cmdstate.delete() to delete the
state file (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
pulkit abandoned this revision.
pulkit added a comment.
Superseded by https://phab.mercurial-scm.org/D3654.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2595
To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
pulkit added a comment.
Superseded by https://phab.mercurial-scm.org/D3651.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2594
To: pulkit, #hg-reviewers
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
After previous patch, we have started preserving user and date values in
graftstate and reusing them during `hg graft --continue`. Now passing --user
and
--date
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Reading the user and date information from graftstate during `hg graft
--continue` will help us in preserving the user and date arguments passed when
`hg graft`
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch adds test showing that we don't preserve the user passed --date and
--user values in `hg graft`. I was fixing that and realized this is untested.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Right now, `hg help graft` says:
The -c/--continue option does not reapply earlier options, except for --force.
which should be treated as a bug.
A
khanchi97 updated this revision to Diff 8896.
khanchi97 edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3187?vs=7877=8896
REVISION DETAIL
https://phab.mercurial-scm.org/D3187
AFFECTED FILES
mercurial/commands.py
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG24e517600b29: graph: add outputgraph() function, called by
ascii() to print (authored by johnstiles, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
spectral accepted this revision.
spectral added a comment.
lgtm, and as long as there's no test differences seems fine. (I don't have
ability to accept the patch, and this is from another Googler anyway, so this
is just first-stage review).
REPOSITORY
rHG Mercurial
REVISION DETAIL
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd1690a64268e: graft: add test for reading old graftstate
files with new mechanism (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previous patches start using state.cmdstate() class for statefiles. The class
has a function delete() to delete the state file. This patch replaces the
existing
pulkit updated this revision to Diff 8892.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2597?vs=8886=8892
REVISION DETAIL
https://phab.mercurial-scm.org/D2597
AFFECTED FILES
tests/test-graft.t
CHANGE DETAILS
diff --git a/tests/test-graft.t
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-graft.t:1417
> An alternative is to use the regular great command to start the process and
> then replace the .hg/graftstate once it's run into conflicts. That might be
> better so we have a repo state (include the merge
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG476324a304b2: graft: start using the cmdstate class to read
and write data to graftstate (authored by pulkit, committed by ).
CHANGED PRIOR TO COMMIT
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG58b08f4ce5f5: graft: use state.cmdstate() to check whether
graftstate exists (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG009aa4af5093: graft: factor out function to read graft
state in separate function (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
On Fri, 25 May 2018 14:12:03 +0200, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov
> # Date 1527241096 -7200
> # Fri May 25 11:38:16 2018 +0200
> # Node ID 8133b5cebe9bcc24d91a0e5dfe2b191a11e4bb44
> # Parent 6f67bfe4b82f1d0f1e11a7092262f961c49fdac9
# HG changeset patch
# User Yuya Nishihara
# Date 1522842709 -32400
# Wed Apr 04 20:51:49 2018 +0900
# Node ID 1aeb71c032cb8e73e868426b61d27c9ca7b7c826
# Parent 454b7e1cf3ab64286c7991fcd45985eb619d04ee
hgweb: wrap {topics}es of help with mappinggenerator or mappinglist
The
# HG changeset patch
# User Yuya Nishihara
# Date 1522842517 -32400
# Wed Apr 04 20:48:37 2018 +0900
# Node ID 454b7e1cf3ab64286c7991fcd45985eb619d04ee
# Parent 84207009ae46b829c61e9fcc5f5cd6d91ab90188
hgweb: wrap {edges} of {nodes} of graph with mappinglist
This was a list
# HG changeset patch
# User Yuya Nishihara
# Date 1524299463 -32400
# Sat Apr 21 17:31:03 2018 +0900
# Node ID ef98fb67b4dfa1a19434efe39f03e1c582285e72
# Parent 772811dd496236017bb0e630b935720da76dbcf0
hgweb: fill {rename} even if ?linerange is specified
Otherwise, {rename %
# HG changeset patch
# User Yuya Nishihara
# Date 1522842480 -32400
# Wed Apr 04 20:48:00 2018 +0900
# Node ID 84207009ae46b829c61e9fcc5f5cd6d91ab90188
# Parent 7758a9a1f49b02dea023ab970e65af1874e6d636
hgweb: wrap {nodes} of graph with mappinggenerator
It was a generator of
# HG changeset patch
# User Yuya Nishihara
# Date 1522842372 -32400
# Wed Apr 04 20:46:12 2018 +0900
# Node ID 7758a9a1f49b02dea023ab970e65af1874e6d636
# Parent a2ff4a325229bd72a5447abe1efa3a2659fcc50b
hgweb: adapt {jsdata} of graph to mappinggenerator
The laziness is
# HG changeset patch
# User Yuya Nishihara
# Date 1522842796 -32400
# Wed Apr 04 20:53:16 2018 +0900
# Node ID 772811dd496236017bb0e630b935720da76dbcf0
# Parent 1aeb71c032cb8e73e868426b61d27c9ca7b7c826
hgweb: wrap {earlycommands} and {othercommands} of help with
# HG changeset patch
# User Yuya Nishihara
# Date 1522842258 -32400
# Wed Apr 04 20:44:18 2018 +0900
# Node ID a2ff4a325229bd72a5447abe1efa3a2659fcc50b
# Parent 381060f39eb7e7751a6f168493b77e2744d8ef07
hgweb: wrap {nextentry} of graph with mappinglist
It's a 0/1-length list
yuja added a comment.
> So I was working on it, but the way I tried to correct "wdir()" is by
handling it as a special case, so introducing an "if" block again similar to
this.
> But you were asking to eliminate the if/else block altogether, I wonder
if there is way ?
IIRC, my
> So I was working on it, but the way I tried to correct "wdir()" is by
> handling it as a special case, so introducing an "if" block again similar to
> this.
> But you were asking to eliminate the if/else block altogether, I wonder if
> there is way ?
IIRC, my point was to avoid adding
martinvonz added inline comments.
INLINE COMMENTS
> pulkit wrote in test-graft.t:1417
> That's a nice idea. I think we can, but the behavior will be bit different
> since graft will think the working directory now contains changes from `rev
> 1` and will straight away try to create a commit
> > Hmm, so we were hoping that whatever `sh` implementation was used would
> support a -d option and would not fail when it was given $PWD? That's a
> really odd assumption, so thanks for cleaning that up. Do other shells (than
> FreeBSD) support a -d option (bash and dash don't seem to)?
>
yuja added a comment.
> > Hmm, so we were hoping that whatever `sh` implementation was used would
support a -d option and would not fail when it was given $PWD? That's a really
odd assumption, so thanks for cleaning that up. Do other shells (than FreeBSD)
support a -d option (bash and
On Thu, 24 May 2018 19:49:47 +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1526916830 -7200
> # Mon May 21 17:33:50 2018 +0200
> # Node ID 4e5fd4b6300a9a58a0acdc718c39468b2cbe4989
> # Parent 53cc81a8caf6106ca0cb7ae1d67586236c3bf4fc
> #
On Thu, 24 May 2018 15:35:40 -0600, tom_hin...@sil.org wrote:
> # HG changeset patch
> # User hindlemail
> # Date 1527195876 21600
> # Thu May 24 15:04:36 2018 -0600
> # Node ID a30dbd52f2148af7f2d9167b5935367e899b7244
> # Parent bd7a3fa71a7291b8b77e6bf03be1d2273391
On Thu, 24 May 2018 15:57:24 -0600, tom_hin...@sil.org wrote:
> # HG changeset patch
> # User hindlemail
> # Date 1527199007 21600
> # Thu May 24 15:56:47 2018 -0600
> # Node ID c5db59b1bae015d926ef172d9201141a40719781
> # Parent bd7a3fa71a7291b8b77e6bf03be1d2273391
On Tue, 22 May 2018 23:43:24 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1527045735 14400
> # Tue May 22 23:22:15 2018 -0400
> # Node ID a6bed2a6eafea7d89af7e12696169c754c9bf64a
> # Parent
# HG changeset patch
# User Anton Shestakov
# Date 1527241096 -7200
# Fri May 25 11:38:16 2018 +0200
# Node ID 8133b5cebe9bcc24d91a0e5dfe2b191a11e4bb44
# Parent 6f67bfe4b82f1d0f1e11a7092262f961c49fdac9
extensions: PoC readme extension for hgweb
Here's a prototype
joerg.sonnenberger added a comment.
If we want to go with a `--close` flag, I think the most natural place would
actually be `hg heads`. This is not really a branch operation after all, but
about cutting off heads. At the same time, none of those options would allow
specifying a commit
pulkit added a comment.
In https://phab.mercurial-scm.org/D3557#57279, @joerg.sonnenberger wrote:
> It doesn't seem to fit the argument schema for `hg branch` at all. I'm open
for better places, but I couldn't think of a consistent place.
The branch command has a `--rev` flag
pulkit added a comment.
The code looks mostly good to me. Needs tests for following cases:
- when working directory is dirty
- when we are in an uncommitted merge state
- there is some bookmark movement code, tests for that
INLINE COMMENTS
> commands.py:1508
> +if not message:
>
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-graft.t:1417
> Can this line be replaced by `hg log -r 1 -r 2 -T '{node}\n' >
> .hg/graftstate` and remove the need for the extension above (and the need to
> create conflicting changes)?
That's a nice idea. I think we
pulkit added inline comments.
INLINE COMMENTS
> martinvonz wrote in state.py:46
> i'll delete this line in flight
Thanks for doing that!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3653
To: pulkit, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
johnstiles created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This allows a cleaner entrypoint for extensions to tweak the
graph output without needing to rewrite all of ascii(), or needing
to manually guess where the
71 matches
Mail list logo