Patchwork keyword: use wvfs.rmtree to remove kwdemo directory

login
register
mail settings
Submitter Christian Ebert
Date April 18, 2015, 1:44 p.m.
Message ID <2ee2af4a432a13da7dca.1429364648@1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa>
Download mbox | patch
Permalink /patch/8739/
State Superseded
Commit 4ecbd88cde9a0a5019ebf77d1c1d4398398f4583
Headers show

Comments

Christian Ebert - April 18, 2015, 1:44 p.m.
# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1429364366 -7200
#      Sat Apr 18 15:39:26 2015 +0200
# Branch stable
# Node ID 2ee2af4a432a13da7dca340e5ce0fe0f128c8304
# Parent  a2dcf460e141fa5979d3b29cce76b958d5b68b94
keyword: use wvfs.rmtree to remove kwdemo directory
Matt Mackall - April 19, 2015, 6 p.m.
On Sat, 2015-04-18 at 15:44 +0200, Christian Ebert wrote:
> # HG changeset patch
> # User Christian Ebert <blacktrash@gmx.net>
> # Date 1429364366 -7200
> #      Sat Apr 18 15:39:26 2015 +0200
> # Branch stable
> # Node ID 2ee2af4a432a13da7dca340e5ce0fe0f128c8304
> # Parent  a2dcf460e141fa5979d3b29cce76b958d5b68b94
> keyword: use wvfs.rmtree to remove kwdemo directory

This is a nice cleanup.. but cleanups aren't accepted in the code
freeze. I look forward to seeing a resend next month.

Patch

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -457,9 +457,7 @@  def demo(ui, repo, *args, **opts):
     repo.commit(text=msg)
     ui.status(_('\n\tkeywords expanded\n'))
     ui.write(repo.wread(fn))
-    for root, dirs, files in os.walk(tmpdir):
-        for f in files:
-            util.unlinkpath(repo.vfs.reljoin(root, f))
+    repo.wvfs.rmtree()
 
 @command('kwexpand',
     commands.walkopts,