yuja added a comment.
> +if not opts.get('no_commit'):
> +lock = repo.lock()
> +try:
>
> tr = repo.transaction('import')
>
> - else:
> - dsguard = dirstateguard.dirstateguard(repo, 'import') +
except: +
On Fri, 15 Jun 2018 11:19:47 -0700, Sean Farley wrote:
> >> # HG changeset patch
> >> # User Sean Farley
> >> # Date 1527357855 -7200
> >> # Sat May 26 20:04:15 2018 +0200
> >> # Branch gca-revset
> >> # Node ID d44266127f1a86af521df2b2c088528c3f3b803a
> >> # Parent
# HG changeset patch
# User Matt Harbison
# Date 1528994104 14400
# Thu Jun 14 12:35:04 2018 -0400
# Node ID b9b8a6cd6b71dacc3e901295d0dae11aa0b04d22
# Parent c924e7dbcd0ff8bf2f7ab9e5bde5f6679d70a894
phabricator: preserve the phase when amending in the Differential fields
I have no idea if
On Fri, 15 Jun 2018 10:48:34 +0200, Boris FELD wrote:
> > I'd rather force callers of ctx.diff() to build a diffopts object.
> Do you see a way to solves the import cycle?
Which one?
Maybe we can move patch.diff*opts() functions to either mdiff or new module
if that's the case.
> > Good. Since I don't have any preference either, let's just stick to
> > --stop.
>
> But histedit and rebase already use --abort, why not using that
> convention? We should use the same thing everywhere.
That's because graft --stop doesn't roll back to the state before starting
the graft.
> > This patch strikes me as a Seems-Like-A-Good-Idea-But-Could-Blowup type
> > of thing. So, what this patch does is conditionally change the behavior
> > of 'log -r' based on the type of object passed in.
>
>
> No, it just allows namespaces to do that. As I said (or tried to say)
yuja added a comment.
> +if not opts.get('no_commit'):
> +lock = repo.lock()
> +tr = repo.transaction('import')
> +dsguard = util.nullcontextmanager()
> +else:
> +lock = util.nullcontextmanager()
> +
> +if not opts.get('no_commit'):
> +lock = repo.lock()
> +tr = repo.transaction('import')
> +dsguard = util.nullcontextmanager()
> +else:
> +lock = util.nullcontextmanager()
> +tr = util.nullcontextmanager()
> +
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG79dcaad9d145: graft: use context manager for config
override (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG275cc461b854: debugcommands: work around logiofd being a
pipe and unseekable (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG79dd61a4554f: py3: replace `unicode` with pycompat.unicode
(authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3708?vs=9053=9079
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGff9694ea3852: resolve: use context manager for config
override (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG565074cc9ac6: tests: suppress read(-1) -
calls in fileobjectobserver (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG47f5454a30ed: cmdutil: say that `graft --stop` stops the
graft instead of aborting (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 rHG7e34fc78701a: merge: use context manager for config
override (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
On Tue, 2018-06-12 at 21:18 +0900, Yuya Nishihara wrote:
> > In https://phab.mercurial-scm.org/D3668#58070, @yuja wrote:
> >
> > > > The `--stop` flag takes back you to the last successful
> > step i.e. it will keep
> > > > your grafted commits, it will just clear the mergestate and
>
On Fri, 15 Jun 2018 08:40:33 +, nspanti-logilab (Nicola Spanti) wrote:
> For laziness, this patch could be also useful. It is also better for text
> shell beginners, because they may not know that they can combine commands
> like that (even if it is basic). Moreover, you can still use `hg
yuja added a comment.
> > This patch strikes me as a Seems-Like-A-Good-Idea-But-Could-Blowup type
> > of thing. So, what this patch does is conditionally change the behavior
> > of 'log -r' based on the type of object passed in.
>
>
> No, it just allows namespaces to
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc924e7dbcd0f: import: use context manager for wlock
(authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3747?vs=9076=9091
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9b1536b02221: backout: use context manager for locks
(authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3744?vs=9073=9088
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGeef4668be8a3: backout: use context manager for
dirstateguard (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG929405af558a: update: use context manager for config
override (API) (authored by martinvonz, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3741?vs=9070=9085#toc
REPOSITORY
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG48c52385e062: tag: use context manager for locks (authored
by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3746?vs=9075=9090
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe218ed5ba484: commit: use context manager for locks
(authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3745?vs=9074=9089
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0d6d0aa3c4bf: backout: use context manager for config
override (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
On Fri, 2018-06-15 at 20:49 +0900, Yuya Nishihara wrote:
> > > Good. Since I don't have any preference either, let's just stick
> > > to
> > > --stop.
> >
> > But histedit and rebase already use --abort, why not using that
> > convention? We should use the same thing everywhere.
>
> That's
On Fri, 15 Jun 2018 00:10:25 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley
> # Date 1527357855 -7200
> # Sat May 26 20:04:15 2018 +0200
> # Branch gca-revset
> # Node ID d44266127f1a86af521df2b2c088528c3f3b803a
> # Parent ab29cfd39f48432d8e7c38cdceb62980d5c22f09
>
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/D3749
AFFECTED FILES
tests/test-commit-interactive-curses.t
CHANGE DETAILS
diff --git
durin42 added a comment.
FYI, this is intended for the stable branch.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3749
To: durin42, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Dear mercurial community,
First of all, I would like to introduce myself, I am Marla and I am
communication officer at Logilab.
On 13/06/2018 02:33, Sean Farley wrote:
Kyle Lippincott writes:
On Thu, Jun 7, 2018 at 9:16 PM, Sean Farley wrote:
Kyle Lippincott writes:
On Thu, Jun 7,
# HG changeset patch
# User Yuya Nishihara
# Date 1529068618 -32400
# Fri Jun 15 22:16:58 2018 +0900
# Branch stable
# Node ID c058c6d1a857dac021d5377ce1bc96274cecae8e
# Parent 03350f5234a48daa3cdaf62f9c534c62b4bb46ed
manifest: fix possible SEGV caused by uninitialized lazymanifest fields
sangeet259 updated this revision to Diff 9092.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3728?vs=9050=9092
REVISION DETAIL
https://phab.mercurial-scm.org/D3728
AFFECTED FILES
mercurial/cmdutil.py
mercurial/commands.py
tests/test-grep.t
pulkit added a comment.
Looks like you forgot to update the commit message.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3728
To: sangeet259, #hg-reviewers
Cc: pulkit, yuja, mharbison72, mercurial-devel
___
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2baf79933b45: tests: replace `echo -n` with `printf` per
check-code (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
martinvonz added a comment.
In https://phab.mercurial-scm.org/D3748#58738, @yuja wrote:
> > +if not opts.get('no_commit'):
> > +lock = repo.lock()
> > +tr = repo.transaction('import')
> > +dsguard = util.nullcontextmanager()
> > +
martinvonz updated this revision to Diff 9095.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3748?vs=9077=9095
REVISION DETAIL
https://phab.mercurial-scm.org/D3748
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git
Yuya Nishihara writes:
> On Fri, 15 Jun 2018 00:10:25 -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley
>> # Date 1527357855 -7200
>> # Sat May 26 20:04:15 2018 +0200
>> # Branch gca-revset
>> # Node ID d44266127f1a86af521df2b2c088528c3f3b803a
>> # Parent
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch introduces a new --abort flag to `hg graft` command which aborts an
interrupted graft and rollbacks to the state before graft.
The behavior when
https://bz.mercurial-scm.org/show_bug.cgi?id=5920
Bug ID: 5920
Summary: templater gives unclear message "parse error: unknown
method 'list'"
Product: Mercurial
Version: 4.6
Hardware: PC
OS: Linux
smf added a comment.
I've looked this over today and have queued this up :-) Unfortunately,
though, the metadata doesn't seem right? I'm not getting your name or email
(nor timestamp) for the patch. Do you want me to use the same name from
> On Jun 15, 2018, at 10:01, Marla da Silva wrote:
>
> We really liked to organize mercurial "mini-sprint" which took place at our
> office few weeks ago and we are ready to organize the "real international
> mercurial sprint"!
>
> So, please note that Paris can be a location if you are
> On Jun 15, 2018, at 09:54, Yuya Nishihara wrote:
>
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1529068618 -32400
> # Fri Jun 15 22:16:58 2018 +0900
> # Branch stable
> # Node ID c058c6d1a857dac021d5377ce1bc96274cecae8e
> # Parent 03350f5234a48daa3cdaf62f9c534c62b4bb46ed
>
idlsoft 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/D3750
AFFECTED FILES
hgext/acl.py
tests/test-acl.t
CHANGE DETAILS
diff --git a/tests/test-acl.t
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This will help us in updating to the start node when the user does `hg graft
--abort`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This will make upcoming patch where we introduce a new elif for the abort case
more readable. Also added a new line before the if-else starts.
REPOSITORY
rHG
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch starts storing the new nodes formed during the ongoing graft
operation in the graftstate. We need the list of new nodes formed while
implmenting
johnstiles added a comment.
In https://phab.mercurial-scm.org/D3665#58828, @smf wrote:
> I've looked this over today and have queued this up :-) Unfortunately,
though, the metadata doesn't seem right? I'm not getting your name or email
(nor timestamp) for the patch. Do you want me to
johnstiles (John Stiles) writes:
> johnstiles added a comment.
>
>
> In https://phab.mercurial-scm.org/D3665#58828, @smf wrote:
>
> > I've looked this over today and have queued this up :-) Unfortunately,
> though, the metadata doesn't seem right? I'm not getting your name or email
>
smf added a comment.
Could you send me the output of `hg export REV | head` or do you just want me
to add your name and not worry about the date/time, etc.?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3665
To: johnstiles, #hg-reviewers, spectral
Cc:
lothiraldan accepted this revision.
lothiraldan added inline comments.
INLINE COMMENTS
> scmutil.py:1506
> +
> +exists as a seprate function so that extension can wrap to show more
> +information like how to fix instabilities"""
Small typo `seprate` -> `separate`
REPOSITORY
rHG
smf added a comment.
It seems I'm having email sending trouble ... going to attempt to send again
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3715
To: martinvonz, #hg-reviewers, durin42
Cc: durin42, smf, lothiraldan, mercurial-devel
# HG changeset patch
# User Sean Farley
# Date 1527357855 -7200
# Sat May 26 20:04:15 2018 +0200
# Branch gca-revset
# Node ID d44266127f1a86af521df2b2c088528c3f3b803a
# Parent ab29cfd39f48432d8e7c38cdceb62980d5c22f09
revset: add a new commonancestorheads method
This is a new revset that
# HG changeset patch
# User Sean Farley
# Date 1527357492 -7200
# Sat May 26 19:58:12 2018 +0200
# Branch gca-revset
# Node ID 6dbbddee08084074fd1a7662e18424a7b70318e2
# Parent c019db5ccfa155de8a98cced1e7f5ddaede439e5
context: factor out commonancestorsheads calculation
A future patch will
# HG changeset patch
# User Sean Farley
# Date 1527357601 -7200
# Sat May 26 20:00:01 2018 +0200
# Branch gca-revset
# Node ID ab29cfd39f48432d8e7c38cdceb62980d5c22f09
# Parent 6dbbddee08084074fd1a7662e18424a7b70318e2
context: add a method to return a list of common ancestor changesets
martinvonz (Martin von Zweigbergk) writes:
> martinvonz added a comment.
>
>
> In https://phab.mercurial-scm.org/D3715#58729, @smf wrote:
>
> > --=-=-=
> > Content-Type: text/plain
> >
> > martinvonz (Martin von Zweigbergk) writes:
> >
> > > martinvonz added a comment.
> >
--=-=-=
Content-Type: text/plain
martinvonz (Martin von Zweigbergk) writes:
> martinvonz added a comment.
>
>
> In https://phab.mercurial-scm.org/D3715#58720, @smf wrote:
>
> > Sean Farley writes:
> >
> > > durin42 (Augie Fackler) writes:
> > >
> > >> durin42 added subscribers:
martinvonz added a comment.
In https://phab.mercurial-scm.org/D3715#58729, @smf wrote:
> --=-=-=
> Content-Type: text/plain
>
> martinvonz (Martin von Zweigbergk) writes:
>
> > martinvonz added a comment.
> >
> > In https://phab.mercurial-scm.org/D3715#58720, @smf
nspanti-logilab added a comment.
For laziness, this patch could be also useful. It is also better for text
shell beginners, because they may not know that they can combine commands like
that (even if it is basic). Moreover, you can still use `hg serve` in
foreground or use it in background
On 24/05/2018 15:37, Yuya Nishihara wrote:
On Thu, 24 May 2018 10:38:55 +0200, Boris Feld wrote:
# HG changeset patch
# User Boris Feld
# Date 1527082300 -7200
# Wed May 23 15:31:40 2018 +0200
# Node ID 2f2232e5f0b60a3dd591ea16dfffc3c0a050acdc
# Parent
On 24/05/2018 15:43, Yuya Nishihara wrote:
On Thu, 24 May 2018 10:38:56 +0200, Boris Feld wrote:
# HG changeset patch
# User Boris Feld
# Date 1526993961 -7200
# Tue May 22 14:59:21 2018 +0200
# Node ID d76075d78a860ea2b3e01f3c05969cd0b8839f35
# Parent
60 matches
Mail list logo
