Show More
@@ -92,7 +92,7 b' def darcs_tip(darcs_repo):' | |||||
92 |
|
92 | |||
93 | def darcs_pull(hg_repo, darcs_repo, chash): |
|
93 | def darcs_pull(hg_repo, darcs_repo, chash): | |
94 | old_tip = darcs_tip(darcs_repo) |
|
94 | old_tip = darcs_tip(darcs_repo) | |
95 |
res = cmd("darcs pull |
|
95 | res = cmd("darcs pull \"%s\" --all --match=\"hash %s\"" % (darcs_repo, chash), hg_repo) | |
96 | print res |
|
96 | print res | |
97 | new_tip = darcs_tip(darcs_repo) |
|
97 | new_tip = darcs_tip(darcs_repo) | |
98 | if not new_tip != old_tip + 1: |
|
98 | if not new_tip != old_tip + 1: | |
@@ -110,7 +110,8 b' def hg_commit( hg_repo, text, author, da' | |||||
110 | old_tip = hg_tip(hg_repo) |
|
110 | old_tip = hg_tip(hg_repo) | |
111 | cmd("hg add -X _darcs", hg_repo) |
|
111 | cmd("hg add -X _darcs", hg_repo) | |
112 | cmd("hg remove -X _darcs --after", hg_repo) |
|
112 | cmd("hg remove -X _darcs --after", hg_repo) | |
113 |
res = cmd("hg commit -l %s -u |
|
113 | res = cmd("hg commit -l %s -u \"%s\" -d \"%s 0\"" % (tmpfile, author, date), hg_repo) | |
|
114 | os.close(fd) | |||
114 | os.unlink(tmpfile) |
|
115 | os.unlink(tmpfile) | |
115 | new_tip = hg_tip(hg_repo) |
|
116 | new_tip = hg_tip(hg_repo) | |
116 | if not new_tip == old_tip + 1: |
|
117 | if not new_tip == old_tip + 1: | |
@@ -156,7 +157,7 b' if __name__ == "__main__":' | |||||
156 | print "Given HG repository must not exist when no SKIP is specified." |
|
157 | print "Given HG repository must not exist when no SKIP is specified." | |
157 | sys.exit(-1) |
|
158 | sys.exit(-1) | |
158 | if skip == None: |
|
159 | if skip == None: | |
159 |
cmd("hg init |
|
160 | cmd("hg init \"%s\"" % (hg_repo)) | |
160 | cmd("darcs initialize", hg_repo) |
|
161 | cmd("darcs initialize", hg_repo) | |
161 | # Get the changes from the Darcs repository |
|
162 | # Get the changes from the Darcs repository | |
162 | change_number = 0 |
|
163 | change_number = 0 |
General Comments 0
You need to be logged in to leave comments.
Login now