repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Forgot to remove this return statement from debugging
2007-05-24
S
imon Hausmann
Forgot to remove thi
s
return statement from
d
ebuggin
g
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-24
Simon H
a
usmann
Fix
c
reating the remotes/
p
4 br
a
nches
based o
n
o
r
igin
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausma
n
n
Load the user
m
a
p f
r
om p4 only once at run-time
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-22
S
imon H
a
usmann
Doc upda
t
es
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fi
x
co
n
version from
o
l
d
style heads/p4 t
o
remotes/p4
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
Hausmann
Another (pot
e
ntially life-saving) idea for
submit
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Sim
o
n
Hausmann
Had an idea for deb
u
ggin
g
, record it :)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Ha
u
smann
Added support
for
g
it-p4 subm
i
t
--direct (experime
n
tal)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausm
a
n
n
Use g
i
t format
-
patch
a
n
d git apply --app
l
y
w
hen extracting
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
S
imon Haus
m
a
n
n
Oops, not
o
nly /se
t
/ gitdir on cl
o
n
e
,
a
lso set
i
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Fix gitdir not
being set when clon
i
ng
.
Needed for wri
t
ing
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
S
i
m
on Hausmann
C
ache the
output o
f
"p4
u
sers"
for faster sy
n
cs o
n
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
R
emoved
t
o
d
o
i
tem that is
i
mplemented :)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Add
e
d support for git-p4 sync/rebase --with-origin
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
a
usmann
Bite the
b
ullet and automatica
l
ly
convert old style
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Chang
e
d the default p4 import branch to be
refs/rem
o
t
e
s
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Hausman
n
Create t
h
e
origin
based imp
o
rt
branch usin
g
git up
d
ate
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
R
e
moved ancient
a
n
d unu
s
e
d
code to find the last
i
mported
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Haus
m
ann
Removed cleantags
c
omma
n
d
.
It doesn't
h
ave any mean
i
ng
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on
H
ausmann
C
lean up code dup
l
i
cation fo
r
revis
i
on parsing
and
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Always
pass
a
s
h
a
1 for
th
e
initial parent so that git
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
Fixi
n
g
syncing (gitdir disco
v
ery /
c
d
)
f
o
r bare repositories
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Mak
e
git-p4 work with bare
r
epositor
i
es
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-07
Simon
Hausmann
Document some implemen
t
ation deta
i
l
s,
f
or the cur
i
ous
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
S
imon
H
ausma
n
n
Cl
e
an
u
p, removed the ol
d
ta
g
g
i
ng code
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on
Hausmann
clea
n
up, ren
a
m
e
d se
l
f
.
globalPrefix to self
.
depotPath
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Simon H
a
u
s
mann
Micro cleanup
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
S
i
m
on H
a
usma
n
n
Doc c
l
eanups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-15
Si
m
on Ha
u
s
m
a
n
n
H
andle
patch errors in git-p4
su
b
mit bette
r
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-15
S
i
m
o
n Haus
m
a
nn
A ne
w
attempt at fixing the child-fast-impo
r
t
-
process
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausman
n
Slightly impr
o
ved form
a
ttin
g
of the
raw_input questions
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
S
imon Hausmann
Re
m
oved the
old
p
atc
h
app
l
y code
f
rom git
-
p4 submit
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Fix the timezone fo
r
matting
.
N
ow qgit
also displ
a
ys
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausm
a
n
n
Prin
t
a
n
error message of some sort
i
f git fast-i
m
port
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
Allow
for
c
onvenient rebasing after git-p4 submit
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on H
a
usmann
Added
a
simple example
o
f usage to the "docume
n
tation" :
)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausmann
f
i
x v
a
riable us
a
ge (oops)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
H
ausmann
Fix file determination
f
or #head i
m
ports
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
A
dded
g
it-p4 clone convenience c
o
m
mand
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hau
s
mann
Hon
o
r --silent for
l
abels
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
S
i
m
on Hausmann
Turn off potenti
a
l
l
y s
l
ow
l
abel de
t
ec
t
ion
b
y defaul
t
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hau
s
m
ann
Pr
o
vide
a tree summ
a
ry
after git-
p
4
re
b
ase
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
S
imon Hausmann
Added git-p4 reb
a
se
c
onvenien
c
e
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausman
n
D
on'
t
t
r
y t
o
parse any op
t
ions wit
h
git-p4 d
e
bug
b
u
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
ausmann
Prefer
git command over git-command
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Hausma
n
n
Mi
n
or cosmetic fix
l
et for the git
-
p4 submit syn
c
quest
i
on
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
S
im
o
n
Hau
s
mann
Different ver
s
ions of p4 have different
output for
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand n
e
w smart
in
c
remen
t
al im
p
ort
that do
e
sn't need
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Set th
e
defa
u
l
t
bra
n
ch in run,
n
o
t
in the
co
n
structo
r
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n H
a
usmann
He
l
p
er func
t
ion to check the existance of a r
e
v
ision
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausm
a
n
n
Added
so
m
e helper function(s) to parse
the depot path
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
smann
Changed
t
he default bra
n
ch for imports
f
rom "mast
e
r
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
C
h
anged the for
m
at o
f
the importe
d
log
m
ess
a
ge slightly
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
D
on't s
h
ow t
h
e submit template and t
h
e
diff fi
r
st in
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Doc
u
mentation enhancem
e
nts
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-detect th
e
c
ur
r
ent git branch before subm
i
t
ting
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Ign
o
re A
p
ple resource f
i
les
w
h
en
i
mporting from
p
erforce
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
on Hausmann
Make the p4
d
ata/c
o
mm
a
nd
c
ac
h
e configurable
through
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hau
s
m
ann
F
ixed p4-debug f
i
le
extens
i
on
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
When trying to
m
a
p
p4 i
n
tegrations to
git merges ju
s
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n
Hausmann
S
e
t
g
i
t
fast
-
impo
r
t marks for eve
r
y impo
r
ted change
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
ausmann
After marking a p4 bra
n
c
h as mer
g
ed
don't ever m
e
rge
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
More fixe
s
in heuristic p
4
br
a
nch detection based on
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Star
t
ed work on p4
bra
n
c
h
d
e
tection (ex
p
e
rimental!)
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausmann
Code cleanups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-11
Simon
H
ausmann
Cleanup
s
, remove unused variable
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausman
n
Create l
i
ghtweig
h
t
g
i
t
tags (using t
h
e "reset" tri
c
k
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon H
a
u
s
m
a
n
n
Changed the
d
efa
u
l
t
git
i
mpo
r
t
bra
n
ch
f
r
om "p4" to
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Avoid the excessive use of
g
it ta
g
s
for ever
y
perforc
e
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor code cleanups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-08
Simon Hausmann
Added a li
t
tle helper script to debug the output of
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree