Wed May 7 19:55:12 CEST 2008 Almad <bugs@almad.net>
* mercurial_copy_with_archive - Mercurial uses hg archive insteaad of cp -rp on mode=copy. This breaks tests as they're not commiting touches on srcdir
diff -rN -u old-buildbot/buildbot/slave/commands.py new-buildbot/buildbot/slave/commands.py
|
old
|
new
|
|
| 2320 | 2320 | d.addCallback(_parse) |
| 2321 | 2321 | return d |
| 2322 | 2322 | |
| | 2323 | def doCopy(self, res): |
| | 2324 | # now copy tree to workdir |
| | 2325 | # we can do it via hg archive as we don't need active workdir there |
| | 2326 | fromdir = os.path.join(self.builder.basedir, self.srcdir) |
| | 2327 | todir = os.path.join(self.builder.basedir, self.workdir) |
| | 2328 | |
| | 2329 | # I'd use from mercurial.dispatch import dispatch ; dispatch(['archive', todir]), |
| | 2330 | # but whole buildbot seems to use console commands, |
| | 2331 | # so we're going to use it here too |
| | 2332 | |
| | 2333 | command = [self.vcexe, "archive", todir] |
| | 2334 | |
| | 2335 | c = ShellCommand(self.builder, command, fromdir, |
| | 2336 | sendRC=False, timeout=self.timeout) |
| | 2337 | self.command = c |
| | 2338 | d = c.start() |
| | 2339 | d.addCallback(self._abandonOnFailure) |
| | 2340 | return d |
| | 2341 | |
| 2323 | 2342 | registerSlaveCommand("hg", Mercurial, command_version) |
| 2324 | 2343 | |
| 2325 | 2344 | |