1. Bitbucket
  2. Public Issue Tracker
  3. master
  4. Issues

Issues

Issue #2591 resolved

bitbucket's view of a commit is missing a file (BB-1430)

Leif Ryge
created an issue

Bitbucket's view of a merge commit is only showing two files being changed where it should show three.

Here is the raw commit, according to bitbucket: {{{ $ curl https://bitbucket.org/0x0000/saturnalia/changeset/54825c21b795/raw/saturnalia-54825c21b795.diff

HG changeset patch -- Bitbucket.org

Project saturnalia

URL https://bitbucket.org/0x0000/saturnalia/overview

User Jonathan Moore moore@spinn3r.com

Date 1300298148 25200

Node ID 54825c21b7959ae903729c3176eef25d0c426fc9

Parent d20e0874ab23192115c1639313225be4b1609796

Parent 0804e429983babdf48f08ddb68205d89f3fcb155

land leif-fix-mutable-defs

--- a/src/python/saturnalia/dataservertask.py +++ b/src/python/saturnalia/dataservertask.py @@ -202,7 +202,11 @@ class DataServerTask (Task): return self._resolutions

  • def _startThread ( self, target, kwargs={} ):
  • def _startThread ( self, target, kwargs=None ): +
  • if kwargs is None:
  • kwargs = {} + thread = Thread( target=target, kwargs=kwargs )

     thread.setDaemon(True)
    

--- a/src/python/saturnalia/chunk.py +++ b/src/python/saturnalia/chunk.py @@ -375,9 +375,9 @@ class Chunk (object):

 def writeVarint ( self, fileMap, offset, value ):
  • wrighterOffset = offset
  • wrighterOffset = [offset]

  • def wrighter ( v, wrighterOffset=[wrighterOffset]):

  • def wrighter ( v ): fileMap[wrighterOffset[0]] = v wrighterOffset[0] += 1 return wrighterOffset[0] }}}

And here is that same commit, as exported by hg 1.8.1: {{{ $ hg export -r 54825c21b795

HG changeset patch

User Jonathan Moore moore@spinn3r.com

Date 1300298148 25200

Node ID 54825c21b7959ae903729c3176eef25d0c426fc9

Parent d20e0874ab23192115c1639313225be4b1609796

Parent 0804e429983babdf48f08ddb68205d89f3fcb155

land leif-fix-mutable-defs

diff -r d20e0874ab23 -r 54825c21b795 src/python/saturnalia/chunk.py --- a/src/python/saturnalia/chunk.py Wed Mar 16 10:45:29 2011 -0700 +++ b/src/python/saturnalia/chunk.py Wed Mar 16 10:55:48 2011 -0700 @@ -375,9 +375,9 @@

 def writeVarint ( self, fileMap, offset, value ):
  • wrighterOffset = offset
  • wrighterOffset = [offset]

  • def wrighter ( v, wrighterOffset=[wrighterOffset]):

  • def wrighter ( v ): fileMap[wrighterOffset[0]] = v wrighterOffset[0] += 1 return wrighterOffset[0] diff -r d20e0874ab23 -r 54825c21b795 src/python/saturnalia/dataservertask.py --- a/src/python/saturnalia/dataservertask.py Wed Mar 16 10:45:29 2011 -0700 +++ b/src/python/saturnalia/dataservertask.py Wed Mar 16 10:55:48 2011 -0700 @@ -202,7 +202,11 @@ return self._resolutions

  • def _startThread ( self, target, kwargs={} ):

  • def _startThread ( self, target, kwargs=None ): +
  • if kwargs is None:
  • kwargs = {} + thread = Thread( target=target, kwargs=kwargs )

     thread.setDaemon(True)
    

    diff -r d20e0874ab23 -r 54825c21b795 src/python/saturnalia/util.py --- a/src/python/saturnalia/util.py Wed Mar 16 10:45:29 2011 -0700 +++ b/src/python/saturnalia/util.py Wed Mar 16 10:55:48 2011 -0700 @@ -72,7 +72,10 @@ return "%s-%s-%s.sat" % ( typeName, resolution, time )

-def getBestResolution ( request_resolution, skip_set=set([]), points_per_tile=100 ): +def getBestResolution ( request_resolution, skip_set=None, points_per_tile=100 ): + + if skip_set is None: + skip_set = set()

 best_resolution = None

}}}

Bitbucket's view of the commit where these three changes were originally made does show all three: https://bitbucket.org/0x0000/saturnalia/changeset/0804e429983b/raw/saturnalia-0804e429983b.diff

Bitbucket's history page for the missing file is also missing the merge commit: https://bitbucket.org/0x0000/saturnalia/history/src/python/saturnalia/util.py (the change is present on the default branch, however).

Comments (2)

  1. Log in to comment