equal
deleted
inserted
replaced
1830 |
1830 |
1831 tmpfp.close() |
1831 tmpfp.close() |
1832 if not diffs_seen: |
1832 if not diffs_seen: |
1833 raise util.Abort(_('no diffs found')) |
1833 raise util.Abort(_('no diffs found')) |
1834 |
1834 |
1835 files = util.patch(strip, tmpname, ui) |
1835 files = util.patch(strip, tmpname, ui, cwd=repo.root) |
1836 if len(files) > 0: |
1836 if len(files) > 0: |
1837 addremove_lock(ui, repo, files, {}) |
1837 cfiles = files |
|
1838 cwd = repo.getcwd() |
|
1839 if cwd: |
|
1840 cfiles = [util.pathto(cwd, f) for f in files] |
|
1841 addremove_lock(ui, repo, cfiles, {}) |
1838 repo.commit(files, message, user, date) |
1842 repo.commit(files, message, user, date) |
1839 finally: |
1843 finally: |
1840 os.unlink(tmpname) |
1844 os.unlink(tmpname) |
1841 |
1845 |
1842 def incoming(ui, repo, source="default", **opts): |
1846 def incoming(ui, repo, source="default", **opts): |