Patchwork [5,of,5,evolve-ext] prune: add --keep to not touch the working copy

login
register
mail settings
Submitter Pierre-Yves David
Date March 20, 2015, 7:56 p.m.
Message ID <550C7B76.4070406@ens-lyon.org>
Download mbox | patch
Permalink /patch/8203/
State Not Applicable
Headers show

Comments

Pierre-Yves David - March 20, 2015, 7:56 p.m.
On 03/19/2015 06:14 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1426787762 25200
> #      Thu Mar 19 10:56:02 2015 -0700
> # Node ID 811a7345955e540045d57ed5698db0f12c27f36e
> # Parent  e93100523ef10fae3fcee2bdeac0f676ed842ecd
> prune: add --keep to not touch the working copy

These are pushed to main, thanks (but the --descendant ones). Thanks!

This last patch received this minor update:

actually changed
                      changedfiles.extend(repo[rev].files())

Patch

--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1839,11 +1839,11 @@  def cmdprune(ui, repo, *revs, **opts):
                  # strip.stripcmd(). We might want to refactor this 
somewhere
                  # common at some point.

                  # only reset the dirstate for files that would 
actually change
                  # between the working context and uctx
-                descendantrevs = repo.revs("%s::." % newnode.rev())
+                descendantrevs = repo.revs("%d::." % newnode.rev())
                  changedfiles = []
                  for rev in descendantrevs:
                      # blindly reset the files, regardless of what