##// END OF EJS Templates
import: get lock and wlock one time...
Vadim Gelfer -
r2854:7706fa50 default
parent child Browse files
Show More
@@ -1822,6 +1822,9 def import_(ui, repo, patch1, *patches,
1822 1822 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
1823 1823 '(---|\*\*\*)[ \t])', re.MULTILINE)
1824 1824
1825 wlock = repo.wlock()
1826 lock = repo.lock()
1827
1825 1828 for patch in patches:
1826 1829 pf = os.path.join(d, patch)
1827 1830
@@ -1910,8 +1913,8 def import_(ui, repo, patch1, *patches,
1910 1913 cwd = repo.getcwd()
1911 1914 if cwd:
1912 1915 cfiles = [util.pathto(cwd, f) for f in files]
1913 addremove_lock(ui, repo, cfiles, {})
1914 repo.commit(files, message, user, date)
1916 addremove_lock(ui, repo, cfiles, {}, wlock=wlock)
1917 repo.commit(files, message, user, date, wlock=wlock, lock=lock)
1915 1918 finally:
1916 1919 os.unlink(tmpname)
1917 1920
General Comments 0
You need to be logged in to leave comments. Login now