Mercurial > hg-stable
comparison mercurial/commands.py @ 11686:fc360de66217
debugbuilddag: build repository content in binary mode
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 26 Jul 2010 23:26:15 +0200 |
| parents | c4f6f0a1bd5a |
| children | efcdf6a953a0 |
comparison
equal
deleted
inserted
replaced
| 11685:aade8f133d11 | 11686:fc360de66217 |
|---|---|
| 888 | 888 |
| 889 if overwritten_file or appended_file: | 889 if overwritten_file or appended_file: |
| 890 # we don't want to fail in merges during buildup | 890 # we don't want to fail in merges during buildup |
| 891 os.environ['HGMERGE'] = 'internal:local' | 891 os.environ['HGMERGE'] = 'internal:local' |
| 892 | 892 |
| 893 def writefile(fname, text, fmode="w"): | 893 def writefile(fname, text, fmode="wb"): |
| 894 f = open(fname, fmode) | 894 f = open(fname, fmode) |
| 895 try: | 895 try: |
| 896 f.write(text) | 896 f.write(text) |
| 897 finally: | 897 finally: |
| 898 f.close() | 898 f.close() |
| 923 if len(ps) > 1: | 923 if len(ps) > 1: |
| 924 p2 = ps[1] | 924 p2 = ps[1] |
| 925 merge(ui, repo, node=p2) | 925 merge(ui, repo, node=p2) |
| 926 | 926 |
| 927 if mergeable_file: | 927 if mergeable_file: |
| 928 f = open("mf", "r+") | 928 f = open("mf", "rb+") |
| 929 try: | 929 try: |
| 930 lines = f.read().split("\n") | 930 lines = f.read().split("\n") |
| 931 lines[id * linesperrev] += " r%i" % id | 931 lines[id * linesperrev] += " r%i" % id |
| 932 f.seek(0) | 932 f.seek(0) |
| 933 f.write("\n".join(lines)) | 933 f.write("\n".join(lines)) |
| 934 finally: | 934 finally: |
| 935 f.close() | 935 f.close() |
| 936 | 936 |
| 937 if appended_file: | 937 if appended_file: |
| 938 writefile("af", "r%i\n" % id, "a") | 938 writefile("af", "r%i\n" % id, "ab") |
| 939 | 939 |
| 940 if overwritten_file: | 940 if overwritten_file: |
| 941 writefile("of", "r%i\n" % id) | 941 writefile("of", "r%i\n" % id) |
| 942 | 942 |
| 943 if new_file: | 943 if new_file: |