Patchwork [6,of,6,V2] hg: update newly added listdir function of vfs in clone

login
register
mail settings
Submitter Chinmay Joshi
Date June 21, 2014, 10:27 a.m.
Message ID <911b2ae39ad6c13fa029.1403346473@genesis>
Download mbox | patch
Permalink /patch/5031/
State Accepted
Commit becb61de90a1a0384af535a393fb32e7da7a9059
Headers show

Comments

Chinmay Joshi - June 21, 2014, 10:27 a.m.
# HG changeset patch
# User Chinmay Joshi <c@chinmayjoshi.com>
# Date 1403342389 -19800
#      Sat Jun 21 14:49:49 2014 +0530
# Node ID 911b2ae39ad6c13fa029915acb82b25321fc54b6
# Parent  b7ac0fd7c56b1e16046960482ed7871a4799fc4a
hg: update newly added listdir function of vfs in clone

This change invokes os.listdir() via newly added vfs function in clone.
Matt Mackall - June 24, 2014, 6:57 p.m.
On Sat, 2014-06-21 at 15:57 +0530, Chinmay Joshi wrote:
> # HG changeset patch
> # User Chinmay Joshi <c@chinmayjoshi.com>
> # Date 1403342389 -19800
> #      Sat Jun 21 14:49:49 2014 +0530
> # Node ID 911b2ae39ad6c13fa029915acb82b25321fc54b6
> # Parent  b7ac0fd7c56b1e16046960482ed7871a4799fc4a
> hg: update newly added listdir function of vfs in clone

These are queued for default, thanks.

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -316,7 +316,7 @@ 
     if destvfs.lexists():
         if not destvfs.isdir():
             raise util.Abort(_("destination '%s' already exists") % dest)
-        elif os.listdir(dest):
+        elif destvfs.listdir():
             raise util.Abort(_("destination '%s' is not empty") % dest)
 
     srclock = destlock = cleandir = None