mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
Merge with MPM.
This commit is contained in:
commit
22c1455510
@ -12,4 +12,5 @@ recursive-include contrib *
|
||||
include README
|
||||
include CONTRIBUTORS
|
||||
include COPYING
|
||||
include Makefile
|
||||
include MANIFEST.in
|
||||
|
3
Makefile
3
Makefile
@ -2,6 +2,9 @@
|
||||
PYTHON=python
|
||||
|
||||
all:
|
||||
$(PYTHON) setup.py build_ext -i
|
||||
|
||||
install:
|
||||
@echo "Read the file README for install instructions."
|
||||
|
||||
clean:
|
||||
|
@ -103,7 +103,7 @@ _hg()
|
||||
export|manifest|update|checkout|up|co)
|
||||
_hg_tags
|
||||
;;
|
||||
pull|push|outgoing|incoming)
|
||||
pull|push|outgoing|incoming|out|in)
|
||||
_hg_paths
|
||||
COMPREPLY=(${COMPREPLY[@]:-} $( compgen -d -- "$cur" ))
|
||||
;;
|
||||
@ -113,7 +113,7 @@ _hg()
|
||||
add)
|
||||
_hg_status "u"
|
||||
;;
|
||||
commit)
|
||||
commit|ci)
|
||||
_hg_status "mra"
|
||||
;;
|
||||
remove)
|
||||
|
@ -773,6 +773,14 @@ class localrepository:
|
||||
def wfile(self, f, mode='r'):
|
||||
return self.wopener(f, mode)
|
||||
|
||||
def wread(self, filename):
|
||||
return self.wopener(filename, 'r').read()
|
||||
|
||||
def wwrite(self, filename, data, fd=None):
|
||||
if fd:
|
||||
return fd.write(data)
|
||||
return self.wopener(filename, 'w').write(data)
|
||||
|
||||
def transaction(self):
|
||||
# save dirstate for undo
|
||||
try:
|
||||
@ -839,7 +847,7 @@ class localrepository:
|
||||
linkrev = self.changelog.count()
|
||||
for f in files:
|
||||
try:
|
||||
t = self.wfile(f).read()
|
||||
t = self.wread(f)
|
||||
tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
|
||||
r = self.file(f)
|
||||
mfm[f] = tm
|
||||
@ -932,7 +940,7 @@ class localrepository:
|
||||
self.ui.note(f + "\n")
|
||||
try:
|
||||
mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False))
|
||||
t = self.wfile(f).read()
|
||||
t = self.wread(f)
|
||||
except IOError:
|
||||
self.ui.warn("trouble committing %s!\n" % f)
|
||||
raise
|
||||
@ -1023,7 +1031,7 @@ class localrepository:
|
||||
mf2, u = None, []
|
||||
|
||||
def fcmp(fn, mf):
|
||||
t1 = self.wfile(fn).read()
|
||||
t1 = self.wread(fn)
|
||||
t2 = self.file(fn).read(mf.get(fn, nullid))
|
||||
return cmp(t1, t2)
|
||||
|
||||
@ -1660,7 +1668,7 @@ class localrepository:
|
||||
|
||||
# is the wfile new since m1, and match m2?
|
||||
if f not in m1:
|
||||
t1 = self.wfile(f).read()
|
||||
t1 = self.wread(f)
|
||||
t2 = self.file(f).read(m2[f])
|
||||
if cmp(t1, t2) == 0:
|
||||
n = m2[f]
|
||||
@ -1780,10 +1788,10 @@ class localrepository:
|
||||
self.ui.note("getting %s\n" % f)
|
||||
t = self.file(f).read(get[f])
|
||||
try:
|
||||
self.wfile(f, "w").write(t)
|
||||
self.wwrite(f, t)
|
||||
except IOError:
|
||||
os.makedirs(os.path.dirname(self.wjoin(f)))
|
||||
self.wfile(f, "w").write(t)
|
||||
self.wwrite(f, t)
|
||||
util.set_exec(self.wjoin(f), mf2[f])
|
||||
if moddirstate:
|
||||
if branch_merge:
|
||||
@ -1836,7 +1844,7 @@ class localrepository:
|
||||
pre = "%s~%s." % (os.path.basename(fn), prefix)
|
||||
(fd, name) = tempfile.mkstemp("", pre)
|
||||
f = os.fdopen(fd, "wb")
|
||||
f.write(fl.read(node))
|
||||
self.wwrite(fn, fl.read(node), f)
|
||||
f.close()
|
||||
return name
|
||||
|
||||
|
@ -844,7 +844,7 @@ class hgwebdir:
|
||||
except:
|
||||
virtual = ""
|
||||
|
||||
if virtual:
|
||||
if virtual[1:]:
|
||||
real = self.cp.get("paths", virtual[1:])
|
||||
h = hgweb(real)
|
||||
h.run()
|
||||
@ -875,9 +875,12 @@ class hgwebdir:
|
||||
except:
|
||||
return default
|
||||
|
||||
url = os.environ["REQUEST_URI"] + "/" + v
|
||||
url = url.replace("//", "/")
|
||||
|
||||
yield dict(author = get("web", "author", "unknown"),
|
||||
name = get("web", "name", v),
|
||||
url = os.environ["REQUEST_URI"] + "/" + v,
|
||||
url = url,
|
||||
parity = parity,
|
||||
shortdesc = get("web", "description", "unknown"),
|
||||
lastupdate = os.stat(os.path.join(r, ".hg",
|
||||
|
@ -142,6 +142,8 @@ options:
|
||||
|
||||
-r --rev
|
||||
revision
|
||||
-a --text
|
||||
treat all files as text
|
||||
-I --include
|
||||
include path in search
|
||||
-X --exclude
|
||||
|
Loading…
Reference in New Issue
Block a user