~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Committer: Martin Pool
Date: 2005-10-17 04:04:33 UTC
mfrom: (1458)
mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1460.
Revision ID: mbp@sourcefrog.net-20051017040433-79379c10856d7b83

[merge] from robert

Show diffs side-by-side

added added

removed removed

bzrlib/commit.py

194

else:

195

self.timestamp = long(timestamp)

196

197

config = bzrlib.config.BranchConfig(self.branch)

197

198

if rev_id is None:

198

self.rev_id = _gen_revision_id(self.branch, self.timestamp)

199

self.rev_id = _gen_revision_id(config, self.timestamp)

199

200

else:

200

201

self.rev_id = rev_id

201

202

203

if committer is None:

203

self.committer = bzrlib.config.username(self.branch)

204

self.committer = config.username()

204

205

else:

205

206

assert isinstance(committer, basestring), type(committer)

206

207

self.committer = committer

419

420

if file_id not in self.new_inv:

420

421

self.reporter.deleted(self.basis_inv.id2path(file_id))

421

422

def _gen_revision_id(branch, when):

423

def _gen_revision_id(config, when):

423

424

"""Return new revision-id."""

424

s = '%s-%s-' % (bzrlib.config.user_email(branch), compact_date(when))

425

s = '%s-%s-' % (config.user_email(), compact_date(when))

425

426

s += hexlify(rand_bytes(8))

426

427

return s

Older »